Revert 236048 "Rename RootWindowHost* to WindowTreeHost*"

trunk/src/ui/aura/root_window_host_x11.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_AURA_ROOT_WINDOW_HOST_X11_H_
 #define UI_AURA_ROOT_WINDOW_HOST_X11_H_
 
 #include <X11/Xlib.h>
 
 #include <vector>
@@ skipping 14 matching lines @@
 namespace ui {
 class MouseEvent;
 }
 
 namespace aura {
 
 namespace internal {
 class TouchEventCalibrate;
 }
 
-class AURA_EXPORT WindowTreeHostX11 : public WindowTreeHost,
+class AURA_EXPORT RootWindowHostX11 : public RootWindowHost,
                                       public base::MessageLoop::Dispatcher,
                                       public EnvObserver {
  public:
-  explicit WindowTreeHostX11(const gfx::Rect& bounds);
-  virtual ~WindowTreeHostX11();
+  explicit RootWindowHostX11(const gfx::Rect& bounds);
+  virtual ~RootWindowHostX11();
 
   // Overridden from Dispatcher overrides:
   virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE;
 
-  // WindowTreeHost Overrides.
+  // RootWindowHost Overrides.
   virtual RootWindow* GetRootWindow() OVERRIDE;
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
   virtual void Show() OVERRIDE;
   virtual void Hide() OVERRIDE;
   virtual void ToggleFullScreen() OVERRIDE;
   virtual gfx::Rect GetBounds() const OVERRIDE;
   virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
   virtual gfx::Insets GetInsets() const OVERRIDE;
   virtual void SetInsets(const gfx::Insets& insets) OVERRIDE;
   virtual gfx::Point GetLocationOnNativeScreen() const OVERRIDE;
@@ skipping 25 matching lines @@
   // Returns true if there's an X window manager present... in most cases.  Some
   // window managers (notably, ion3) don't implement enough of ICCCM for us to
   // detect that they're there.
   bool IsWindowManagerPresent();
 
   // Sets the cursor on |xwindow_| to |cursor|.  Does not check or update
   // |current_cursor_|.
   void SetCursorInternal(gfx::NativeCursor cursor);
 
   // Translates the native mouse location into screen coordinates and and
-  // dispatches the event to WindowTreeHostDelegate.
+  // dispatches the event to RootWindowHostDelegate.
   void TranslateAndDispatchMouseEvent(ui::MouseEvent* event);
 
   // Update is_internal_display_ based on delegate_ state
   void UpdateIsInternalDisplay();
 
   // Set the CrOS touchpad "tap paused" property. It is used to temporarily
   // turn off the Tap-to-click feature when the mouse pointer is invisible.
   void SetCrOSTapPaused(bool state);
 
   // The display and the native X window hosting the root window.
@@ skipping 28 matching lines @@
 
   scoped_ptr<internal::TouchEventCalibrate> touch_calibrate_;
 
   scoped_ptr<MouseMoveFilter> mouse_move_filter_;
 
   ui::X11AtomCache atom_cache_;
 
   // Touch ids of which the touch press happens at side bezel region.
   uint32 bezel_tracking_ids_;
 
-  DISALLOW_COPY_AND_ASSIGN(WindowTreeHostX11);
+  DISALLOW_COPY_AND_ASSIGN(RootWindowHostX11);
 };
 
 namespace test {
 
 // Set the default value of the override redirect flag used to
-// create a X window for WindowTreeHostX11.
+// create a X window for RootWindowHostX11.
 AURA_EXPORT void SetUseOverrideRedirectWindowByDefault(bool override_redirect);
 
 }  // namespace test
 }  // namespace aura
 
 #endif  // UI_AURA_ROOT_WINDOW_HOST_X11_H_