ozone: Port WindowTreeHostOzone on top of PlatformWindow

ui/aura/window_tree_host_ozone.h

Index: ui/aura/window_tree_host_ozone.h
diff --git a/ui/aura/window_tree_host_ozone.h b/ui/aura/window_tree_host_ozone.h
index 672f06373805c4bbc1ed1c6e22487a2c84cf18df..2db477c6185718e715884503f4ee6d015e30f57d 100644
--- a/ui/aura/window_tree_host_ozone.h
+++ b/ui/aura/window_tree_host_ozone.h
@@ -13,12 +13,18 @@
 #include "ui/events/platform/platform_event_dispatcher.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/rect.h"
+#include "ui/platform_window/platform_window_delegate.h"
+
+namespace ui {
+class PlatformWindow;
+}
 
 namespace aura {
 
 class AURA_EXPORT WindowTreeHostOzone : public WindowTreeHost,
                                         public ui::EventSource,
-                                        public ui::PlatformEventDispatcher {
+                                        public ui::PlatformEventDispatcher,

[sadrul, 2014/07/14 22:58:07]

It should no longer be necessary for WindowTreeHostOzone to be a
PlatformEventDispatcher.

[spang, 2014/07/14 23:17:41]

Done.

+                                        public ui::PlatformWindowDelegate {
  public:
   explicit WindowTreeHostOzone(const gfx::Rect& bounds);
   virtual ~WindowTreeHostOzone();
@@ -28,6 +34,17 @@ class AURA_EXPORT WindowTreeHostOzone : public WindowTreeHost,
   virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
   virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
 
+  // ui::PlatformWindowDelegate:
+  virtual void OnBoundsChanged(const gfx::Rect&) OVERRIDE;
+  virtual void OnDamageRect(const gfx::Rect& damaged_region) OVERRIDE;
+  virtual void DispatchEvent(ui::Event* event) OVERRIDE;
+  virtual void OnCloseRequest() OVERRIDE;
+  virtual void OnClosed() OVERRIDE;
+  virtual void OnWindowStateChanged(ui::PlatformWindowState new_state) OVERRIDE;
+  virtual void OnLostCapture() OVERRIDE;
+  virtual void OnAcceleratedWidgetAvailable(
+      gfx::AcceleratedWidget widget) OVERRIDE;
+
   // WindowTreeHost:
   virtual ui::EventSource* GetEventSource() OVERRIDE;
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
@@ -46,8 +63,11 @@ class AURA_EXPORT WindowTreeHostOzone : public WindowTreeHost,
   // ui::EventSource overrides.
   virtual ui::EventProcessor* GetEventProcessor() OVERRIDE;
 
+  // Platform-specific part of this WindowTreeHost.
+  scoped_ptr<ui::PlatformWindow> platform_window_;
+
+  // The identifier used to create a compositing surface.
   gfx::AcceleratedWidget widget_;
-  gfx::Rect bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHostOzone);
 };