Mandoline: Merge Surfaces and Views apps

components/view_manager/gles2/command_buffer_driver.h

Index: components/view_manager/gles2/command_buffer_driver.h
diff --git a/components/view_manager/gles2/command_buffer_driver.h b/components/view_manager/gles2/command_buffer_driver.h
index f42e51731f33dad0a047fd66f2a730869c02c543..aa9b4aa9ae1d5ad2abf81109c9cce108a73ac5c9 100644
--- a/components/view_manager/gles2/command_buffer_driver.h
+++ b/components/view_manager/gles2/command_buffer_driver.h
@@ -13,7 +13,6 @@
 #include "base/timer/timer.h"
 #include "components/view_manager/public/interfaces/command_buffer.mojom.h"
 #include "ui/gfx/geometry/size.h"
-#include "ui/gfx/native_widget_types.h"
 
 namespace gpu {
 class CommandBufferService;
@@ -40,18 +39,10 @@ class CommandBufferDriver {
   class Client {
    public:
     virtual ~Client();
-    virtual void UpdateVSyncParameters(base::TimeTicks timebase,
-                                       base::TimeDelta interval) = 0;
     virtual void DidLoseContext() = 0;
   };
-  // Offscreen.
   explicit CommandBufferDriver(scoped_refptr<GpuState> gpu_state);
 
-  // Onscreen.
-  CommandBufferDriver(
-      gfx::AcceleratedWidget widget,
-      scoped_refptr<GpuState> gpu_state,
-      const base::Callback<void(CommandBufferDriver*)>& destruct_callback);
   ~CommandBufferDriver();
 
   void set_client(scoped_ptr<Client> client) { client_ = client.Pass(); }
@@ -75,10 +66,6 @@ class CommandBufferDriver {
                    int32_t internal_format);
   void DestroyImage(int32_t id);
 
-  // Called at shutdown to destroy the X window. This is needed when the parent
-  // window is being destroyed. Otherwise X calls for this window will fail.
-  void DestroyWindow();
-
  private:
   bool MakeCurrent();
   bool DoInitialize(mojo::ScopedSharedBufferHandle shared_state);
@@ -87,14 +74,11 @@ class CommandBufferDriver {
   void OnSyncPointRetired();
   void OnParseError();
   void OnContextLost(uint32_t reason);
-  void OnUpdateVSyncParameters(const base::TimeTicks timebase,
-                               const base::TimeDelta interval);
   void DestroyDecoder();
 
   scoped_ptr<Client> client_;
   mojo::CommandBufferSyncClientPtr sync_client_;
   mojo::CommandBufferLostContextObserverPtr loss_observer_;
-  gfx::AcceleratedWidget widget_;
   scoped_ptr<gpu::CommandBufferService> command_buffer_;
   scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;
   scoped_ptr<gpu::GpuScheduler> scheduler_;
@@ -105,8 +89,6 @@ class CommandBufferDriver {
   scoped_refptr<base::SingleThreadTaskRunner> context_lost_task_runner_;
   base::Callback<void(int32_t)> context_lost_callback_;
 
-  base::Callback<void(CommandBufferDriver*)> destruct_callback_;
-
   base::WeakPtrFactory<CommandBufferDriver> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CommandBufferDriver);