1 files changed, 12 insertions, 12 deletions
diff --git a/chromium/content/browser/gpu/gpu_data_manager_impl.h b/chromium/content/browser/gpu/gpu_data_manager_impl.h
index 7fb75a40894..5a783e46c75 100644
--- a/chromium/content/browser/gpu/gpu_data_manager_impl.h
+++ b/chromium/content/browser/gpu/gpu_data_manager_impl.h
@@ -22,10 +22,13 @@
 #include "content/public/common/three_d_api_types.h"
 #include "gpu/config/gpu_info.h"
 
-class CommandLine;
 class GURL;
 struct WebPreferences;
 
+namespace base {
+class CommandLine;
+}
+
 namespace content {
 
 class GpuDataManagerImplPrivate;
@@ -95,15 +98,14 @@ class CONTENT_EXPORT GpuDataManagerImpl
 
   // Insert disable-feature switches corresponding to preliminary gpu feature
   // flags into the renderer process command line.
-  void AppendRendererCommandLine(CommandLine* command_line) const;
+  void AppendRendererCommandLine(base::CommandLine* command_line) const;
 
-  // Insert switches into gpu process command line: kUseGL,
-  // kDisableGLMultisampling.
-  void AppendGpuCommandLine(CommandLine* command_line) const;
+  // Insert switches into gpu process command line: kUseGL, etc.
+  void AppendGpuCommandLine(base::CommandLine* command_line) const;
 
   // Insert switches into plugin process command line:
   // kDisableCoreAnimationPlugins.
-  void AppendPluginCommandLine(CommandLine* command_line) const;
+  void AppendPluginCommandLine(base::CommandLine* command_line) const;
 
   // Update WebPreferences for renderer based on blacklisting decisions.
   void UpdateRendererWebPrefs(WebPreferences* prefs) const;
@@ -133,12 +135,6 @@ class CONTENT_EXPORT GpuDataManagerImpl
   // Called when switching gpu.
   void HandleGpuSwitch();
 
-#if defined(OS_WIN)
-  // Is the GPU process using the accelerated surface to present, instead of
-  // presenting by itself.
-  bool IsUsingAcceleratedSurface() const;
-#endif
-
   // Maintenance of domains requiring explicit user permission before
   // using client-facing 3D APIs (WebGL, Pepper 3D), either because
   // the domain has caused the GPU to reset, or because too many GPU
@@ -170,6 +166,10 @@ class CONTENT_EXPORT GpuDataManagerImpl
   void SetDisplayCount(unsigned int display_count);
   unsigned int GetDisplayCount() const;
 
+  // Set the active gpu.
+  // Return true if it's a different GPU from the previous active one.
+  bool UpdateActiveGpu(uint32 vendor_id, uint32 device_id);
+
   // Called when GPU process initialization failed.
   void OnGpuProcessInitFailure();