Revert 236048 "Rename RootWindowHost* to WindowTreeHost*"

trunk/src/ui/views/widget/desktop_aura/desktop_root_window_host_x11.h

Index: trunk/src/ui/views/widget/desktop_aura/desktop_root_window_host_x11.h
===================================================================
--- trunk/src/ui/views/widget/desktop_aura/desktop_root_window_host_x11.h	(revision 236092)
+++ trunk/src/ui/views/widget/desktop_aura/desktop_root_window_host_x11.h	(working copy)
@@ -28,25 +28,25 @@
 namespace views {
 class DesktopDragDropClientAuraX11;
 class DesktopDispatcherClient;
-class DesktopWindowTreeHostObserverX11;
+class DesktopRootWindowHostObserverX11;
 class X11DesktopWindowMoveClient;
 class X11WindowEventFilter;
 
-class VIEWS_EXPORT DesktopWindowTreeHostX11 :
-    public DesktopWindowTreeHost,
-    public aura::WindowTreeHost,
+class VIEWS_EXPORT DesktopRootWindowHostX11 :
+    public DesktopRootWindowHost,
+    public aura::RootWindowHost,
     public base::MessageLoop::Dispatcher {
  public:
-  DesktopWindowTreeHostX11(
+  DesktopRootWindowHostX11(
       internal::NativeWidgetDelegate* native_widget_delegate,
       DesktopNativeWidgetAura* desktop_native_widget_aura);
-  virtual ~DesktopWindowTreeHostX11();
+  virtual ~DesktopRootWindowHostX11();
 
   // A way of converting an X11 |xid| host window into a |content_window_|.
   static aura::Window* GetContentWindowForXID(XID xid);
 
   // A way of converting an X11 |xid| host window into this object.
-  static DesktopWindowTreeHostX11* GetHostForXID(XID xid);
+  static DesktopRootWindowHostX11* GetHostForXID(XID xid);
 
   // Get all open top-level windows. This includes windows that may not be
   // visible. This list is sorted in their stacking order, i.e. the first window
@@ -60,14 +60,14 @@
   // has changed our activation.
   void HandleNativeWidgetActivationChanged(bool active);
 
-  void AddObserver(views::DesktopWindowTreeHostObserverX11* observer);
-  void RemoveObserver(views::DesktopWindowTreeHostObserverX11* observer);
+  void AddObserver(views::DesktopRootWindowHostObserverX11* observer);
+  void RemoveObserver(views::DesktopRootWindowHostObserverX11* observer);
 
   // Deallocates the internal list of open windows.
   static void CleanUpWindowList();
 
  protected:
-  // Overridden from DesktopWindowTreeHost:
+  // Overridden from DesktopRootWindowHost:
   virtual void Init(aura::Window* content_window,
                     const Widget::InitParams& params,
                     aura::RootWindow::CreateParams* rw_create_params) OVERRIDE;
@@ -78,7 +78,7 @@
       CreateDragDropClient(DesktopNativeCursorManager* cursor_manager) OVERRIDE;
   virtual void Close() OVERRIDE;
   virtual void CloseNow() OVERRIDE;
-  virtual aura::WindowTreeHost* AsWindowTreeHost() OVERRIDE;
+  virtual aura::RootWindowHost* AsRootWindowHost() OVERRIDE;
   virtual void ShowWindowWithState(ui::WindowShowState show_state) OVERRIDE;
   virtual void ShowMaximizedWithBounds(
       const gfx::Rect& restored_bounds) OVERRIDE;
@@ -127,7 +127,7 @@
   virtual void OnNativeWidgetBlur() OVERRIDE;
   virtual bool IsAnimatingClosed() const OVERRIDE;
 
-  // Overridden from aura::WindowTreeHost:
+  // Overridden from aura::RootWindowHost:
   virtual aura::RootWindow* GetRootWindow() OVERRIDE;
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
   virtual void Show() OVERRIDE;
@@ -193,7 +193,7 @@
   // Overridden from Dispatcher:
   virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE;
 
-  base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;
+  base::WeakPtrFactory<DesktopRootWindowHostX11> close_widget_factory_;
 
   // X11 things
   // The display and the native X window hosting the root window.
@@ -258,23 +258,23 @@
 
   // We can optionally have a parent which can order us to close, or own
   // children who we're responsible for closing when we CloseNow().
-  DesktopWindowTreeHostX11* window_parent_;
-  std::set<DesktopWindowTreeHostX11*> window_children_;
+  DesktopRootWindowHostX11* window_parent_;
+  std::set<DesktopRootWindowHostX11*> window_children_;
 
-  ObserverList<DesktopWindowTreeHostObserverX11> observer_list_;
+  ObserverList<DesktopRootWindowHostObserverX11> observer_list_;
 
   // The current root window host that has capture. While X11 has something
   // like Windows SetCapture()/ReleaseCapture(), it is entirely implicit and
   // there are no notifications when this changes. We need to track this so we
   // can notify widgets when they have lost capture, which controls a bunch of
   // things in views like hiding menus.
-  static DesktopWindowTreeHostX11* g_current_capture;
+  static DesktopRootWindowHostX11* g_current_capture;
 
   // A list of all (top-level) windows that have been created but not yet
   // destroyed.
   static std::list<XID>* open_windows_;
 
-  DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11);
+  DISALLOW_COPY_AND_ASSIGN(DesktopRootWindowHostX11);
 };
 
 }  // namespace views