Introduce RootWindowHostDelegate. The RootWindowHost performs most of its communication with RootWi…

ui/aura/root_window_host.h

Index: ui/aura/root_window_host.h
===================================================================
--- ui/aura/root_window_host.h	(revision 148788)
+++ ui/aura/root_window_host.h	(working copy)
@@ -20,6 +20,7 @@
 namespace aura {
 
 class RootWindow;
+class RootWindowHostDelegate;
 
 // RootWindowHost bridges between a native window and the embedded RootWindow.
 // It provides the accelerated widget and maps events from the native os to
@@ -29,22 +30,20 @@
   virtual ~RootWindowHost() {}
 
   // Creates a new RootWindowHost. The caller owns the returned value.
-  static RootWindowHost* Create(const gfx::Rect& bounds);
+  static RootWindowHost* Create(RootWindowHostDelegate* delegate,
+                                const gfx::Rect& bounds);
 
   // Returns the actual size of the screen.
   // (gfx::Screen only reports on the virtual desktop exposed by Aura.)
   static gfx::Size GetNativeScreenSize();
 
+  virtual RootWindow* GetRootWindow() = 0;
+
   // Returns the RootWindowHost for the specified accelerated widget, or NULL if
   // there is none associated.
   static RootWindowHost* GetForAcceleratedWidget(
       gfx::AcceleratedWidget accelerated_widget);
 
-  // Sets the RootWindow this RootWindowHost is hosting. RootWindowHost does not
-  // own the RootWindow.
-  virtual void SetRootWindow(RootWindow* root_window) = 0;
-  virtual RootWindow* GetRootWindow() = 0;
-
   // Returns the accelerated widget.
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() = 0;