[WIP] ui/window: Master CL.

ui/aura/window_tree_host_x11.h

Index: ui/aura/window_tree_host_x11.h
diff --git a/ui/aura/window_tree_host_x11.h b/ui/aura/window_tree_host_x11.h
index 67ec4b29dc63573d986950d8e403938029c21948..3e8a2850d2e026beb6daf7e2a68c41b653d40ec1 100644
--- a/ui/aura/window_tree_host_x11.h
+++ b/ui/aura/window_tree_host_x11.h
@@ -13,6 +13,7 @@
 #include "ui/gfx/insets.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/x/x11_atom_cache.h"
+#include "ui/window/platform_window.h"
 
 // X forward decls to avoid including Xlib.h in a header file.
 typedef struct _XDisplay XDisplay;
@@ -21,6 +22,7 @@ typedef XID Window;
 
 namespace ui {
 class MouseEvent;
+class PlatformWindow;
 }
 
 namespace aura {
@@ -31,8 +33,8 @@ class TouchEventCalibrate;
 
 class AURA_EXPORT WindowTreeHostX11 : public WindowTreeHost,
                                       public ui::EventSource,
-                                      public ui::PlatformEventDispatcher {
-
+                                      public ui::PlatformEventDispatcher,
+                                      public ui::PlatformWindowDelegate {
  public:
   explicit WindowTreeHostX11(const gfx::Rect& bounds);
   virtual ~WindowTreeHostX11();
@@ -61,6 +63,15 @@ class AURA_EXPORT WindowTreeHostX11 : public WindowTreeHost,
   // ui::EventSource overrides.
   virtual ui::EventProcessor* GetEventProcessor() OVERRIDE;
 
+  // ui::PlatformWindowDelegate:
+  virtual void OnBoundsChanged(const gfx::Rect& new_bounds) 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;
+
  protected:
   // Called when X Configure Notify event is recevied.
   virtual void OnConfigureNotify();
@@ -107,6 +118,8 @@ class AURA_EXPORT WindowTreeHostX11 : public WindowTreeHost,
 
   ui::X11AtomCache atom_cache_;
 
+  scoped_ptr<ui::PlatformWindow> platform_window_;
+
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHostX11);
 };