Revert of Mojo multiple command buffer support and sample

mojo/services/view_manager/window_tree_host_impl.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MOJO_AURA_WINDOW_TREE_HOST_MOJO_H_
 #define MOJO_AURA_WINDOW_TREE_HOST_MOJO_H_
 
 #include "base/bind.h"
-#include "mojo/services/public/interfaces/gpu/gpu.mojom.h"
 #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/events/event_source.h"
 #include "ui/gfx/rect.h"
 
 namespace ui {
 class ContextFactory;
 }
 
 namespace mojo {
 namespace service {
 
 class ContextFactoryImpl;
 
 class WindowTreeHostImpl : public aura::WindowTreeHost,
                            public ui::EventSource,
                            public NativeViewportClient {
  public:
-  WindowTreeHostImpl(NativeViewportPtr viewport,
-                     GpuPtr gpu_service,
-                     const gfx::Rect& bounds,
-                     const Callback<void()>& compositor_created_callback,
-                     const Callback<void()>& native_viewport_closed_callback,
-                     const Callback<void(EventPtr)>& event_received_callback);
+  WindowTreeHostImpl(
+      NativeViewportPtr viewport,
+      const gfx::Rect& bounds,
+      const Callback<void()>& compositor_created_callback,
+      const Callback<void()>& native_viewport_closed_callback,
+      const Callback<void(EventPtr)>& event_received_callback);
   virtual ~WindowTreeHostImpl();
 
   gfx::Rect bounds() const { return bounds_; }
 
  private:
   // WindowTreeHost:
   virtual ui::EventSource* GetEventSource() OVERRIDE;
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
   virtual void Show() OVERRIDE;
   virtual void Hide() OVERRIDE;
   virtual gfx::Rect GetBounds() const OVERRIDE;
   virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
   virtual gfx::Point GetLocationOnNativeScreen() const OVERRIDE;
   virtual void SetCapture() OVERRIDE;
   virtual void ReleaseCapture() OVERRIDE;
   virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE;
   virtual void SetCursorNative(gfx::NativeCursor cursor) OVERRIDE;
   virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE;
   virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE;
 
   // ui::EventSource:
   virtual ui::EventProcessor* GetEventProcessor() OVERRIDE;
 
   // Overridden from NativeViewportClient:
-  virtual void OnCreated(uint64_t native_viewport_id) OVERRIDE;
-  virtual void OnDestroyed() OVERRIDE;
+  virtual void OnCreated() OVERRIDE;
+  virtual void OnDestroyed(const mojo::Callback<void()>& callback) OVERRIDE;
   virtual void OnBoundsChanged(RectPtr bounds) OVERRIDE;
   virtual void OnEvent(EventPtr event,
                        const mojo::Callback<void()>& callback) OVERRIDE;
 
   static ContextFactoryImpl* context_factory_;
 
   NativeViewportPtr native_viewport_;
-  GpuPtr gpu_service_;
-  gfx::AcceleratedWidget widget_;
   Callback<void()> compositor_created_callback_;
   Callback<void()> native_viewport_closed_callback_;
   Callback<void(EventPtr)> event_received_callback_;
 
   gfx::Rect bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHostImpl);
 };
 
 }  // namespace service
 }  // namespace mojo
 
 #endif  // MOJO_AURA_WINDOW_TREE_HOST_MOJO_H_