Index: ui/aura/root_window_host_x11.h |
diff --git a/ui/aura/root_window_host_x11.h b/ui/aura/root_window_host_x11.h |
index d4b35186a8b96add9fb145f56ce6a04f9c5a3c09..ece96428415864a2cc18cce519dca881d1386f59 100644 |
--- a/ui/aura/root_window_host_x11.h |
+++ b/ui/aura/root_window_host_x11.h |
@@ -33,18 +33,18 @@ namespace internal { |
class TouchEventCalibrate; |
} |
-class AURA_EXPORT RootWindowHostX11 : public RootWindowHost, |
+class AURA_EXPORT WindowTreeHostX11 : public WindowTreeHost, |
public base::MessageLoop::Dispatcher, |
public ui::EventSource, |
public EnvObserver { |
public: |
- explicit RootWindowHostX11(const gfx::Rect& bounds); |
- virtual ~RootWindowHostX11(); |
+ explicit WindowTreeHostX11(const gfx::Rect& bounds); |
+ virtual ~WindowTreeHostX11(); |
// Overridden from Dispatcher overrides: |
virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE; |
- // RootWindowHost Overrides. |
+ // WindowTreeHost Overrides. |
virtual RootWindow* GetRootWindow() OVERRIDE; |
virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE; |
virtual void Show() OVERRIDE; |
@@ -94,7 +94,7 @@ class AURA_EXPORT RootWindowHostX11 : public RootWindowHost, |
void SetCursorInternal(gfx::NativeCursor cursor); |
// Translates the native mouse location into screen coordinates and and |
- // dispatches the event to RootWindowHostDelegate. |
+ // dispatches the event to WindowTreeHostDelegate. |
void TranslateAndDispatchMouseEvent(ui::MouseEvent* event); |
// Update is_internal_display_ based on delegate_ state |
@@ -137,13 +137,13 @@ class AURA_EXPORT RootWindowHostX11 : public RootWindowHost, |
// Touch ids of which the touch press happens at side bezel region. |
uint32 bezel_tracking_ids_; |
- DISALLOW_COPY_AND_ASSIGN(RootWindowHostX11); |
+ DISALLOW_COPY_AND_ASSIGN(WindowTreeHostX11); |
}; |
namespace test { |
// Set the default value of the override redirect flag used to |
-// create a X window for RootWindowHostX11. |
+// create a X window for WindowTreeHostX11. |
AURA_EXPORT void SetUseOverrideRedirectWindowByDefault(bool override_redirect); |
} // namespace test |