Revert 236048 "Rename RootWindowHost* to WindowTreeHost*"

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

 // Copyright (c) 2012 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 UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
 
 #include "base/memory/weak_ptr.h"
 #include "ui/aura/client/activation_change_observer.h"
 #include "ui/aura/client/activation_delegate.h"
@@ skipping 23 matching lines @@
 class InputMethodEventFilter;
 class ShadowController;
 class TooltipController;
 class VisibilityController;
 class WindowModalityController;
 }
 
 class DesktopCaptureClient;
 class DesktopDispatcherClient;
 class DesktopEventClient;
-class DesktopWindowTreeHost;
+class DesktopRootWindowHost;
 class DropHelper;
 class FocusManagerEventHandler;
 class TooltipManagerAura;
 class WindowReorderer;
 
 class VIEWS_EXPORT DesktopNativeWidgetAura
     : public internal::NativeWidgetPrivate,
       public aura::WindowDelegate,
       public aura::client::ActivationDelegate,
       public aura::client::ActivationChangeObserver,
       public aura::client::FocusChangeObserver,
       public views::internal::InputMethodDelegate,
       public aura::client::DragDropDelegate,
       public aura::RootWindowObserver {
  public:
   explicit DesktopNativeWidgetAura(internal::NativeWidgetDelegate* delegate);
   virtual ~DesktopNativeWidgetAura();
 
   // Maps from window to DesktopNativeWidgetAura.
   static DesktopNativeWidgetAura* ForWindow(aura::Window* window);
 
-  // Called by our DesktopWindowTreeHost after it has deleted native resources;
+  // Called by our DesktopRootWindowHost after it has deleted native resources;
   // this is the signal that we should start our shutdown.
   virtual void OnHostClosed();
 
-  // Called from ~DesktopWindowTreeHost. This takes the RootWindow as by the
+  // Called from ~DesktopRootWindowHost. This takes the RootWindow as by the
   // time we get here |root_window_| is NULL.
-  virtual void OnDesktopWindowTreeHostDestroyed(aura::RootWindow* root);
+  virtual void OnDesktopRootWindowHostDestroyed(aura::RootWindow* root);
 
   corewm::InputMethodEventFilter* input_method_event_filter() {
     return input_method_event_filter_.get();
   }
   corewm::CompoundEventFilter* root_window_event_filter() {
     return root_window_event_filter_;
   }
 
   // Overridden from NativeWidget:
   virtual ui::EventHandler* GetEventHandler() OVERRIDE;
@@ skipping 128 matching lines @@
   // Overridden from views::internal::InputMethodDelegate:
   virtual void DispatchKeyEventPostIME(const ui::KeyEvent& key) OVERRIDE;
 
   // Overridden from aura::client::DragDropDelegate:
   virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE;
   virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE;
   virtual void OnDragExited() OVERRIDE;
   virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE;
 
   // Overridden from aura::RootWindowObserver:
-  virtual void OnWindowTreeHostCloseRequested(
+  virtual void OnRootWindowHostCloseRequested(
       const aura::RootWindow* root) OVERRIDE;
-  virtual void OnWindowTreeHostResized(const aura::RootWindow* root) OVERRIDE;
-  virtual void OnWindowTreeHostMoved(const aura::RootWindow* root,
+  virtual void OnRootWindowHostResized(const aura::RootWindow* root) OVERRIDE;
+  virtual void OnRootWindowHostMoved(const aura::RootWindow* root,
                                      const gfx::Point& new_origin) OVERRIDE;
 
  private:
   friend class FocusManagerEventHandler;
 
   // Installs the input method filter.
   void InstallInputMethodEventFilter();
 
   // To save a clear on platforms where the window is never transparent, the
   // window is only set as transparent when the glass frame is in use.
   void UpdateWindowTransparency();
 
   // See class documentation for Widget in widget.h for a note about ownership.
   Widget::InitParams::Ownership ownership_;
 
   scoped_ptr<DesktopCaptureClient> capture_client_;
 
   // The NativeWidget owns the RootWindow. Required because the RootWindow owns
-  // its WindowTreeHost, so DesktopWindowTreeHost can't own it.
+  // its RootWindowHost, so DesktopRootWindowHost can't own it.
   scoped_ptr<aura::RootWindow> root_window_;
 
   // The following factory is used for calls to close the NativeWidgetAura
   // instance.
   base::WeakPtrFactory<DesktopNativeWidgetAura> close_widget_factory_;
 
   // Can we be made active?
   bool can_activate_;
 
   // Ownership passed to RootWindow on Init.
-  DesktopWindowTreeHost* desktop_root_window_host_;
+  DesktopRootWindowHost* desktop_root_window_host_;
 
   // Child of the root, contains |content_window_|.
   aura::Window* content_window_container_;
 
   // Child of |content_window_container_|. This is the return value from
   // GetNativeView().
   // WARNING: this may be NULL, in particular during shutdown it becomes NULL.
   aura::Window* content_window_;
 
   internal::NativeWidgetDelegate* native_widget_delegate_;
@@ skipping 36 matching lines @@
 
   // See class documentation for Widget in widget.h for a note about type.
   Widget::InitParams::Type widget_type_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_