Index: ui/aura/root_window_host_win.h |
diff --git a/ui/aura/root_window_host_win.h b/ui/aura/root_window_host_win.h |
index 3d99821400af10cca18d609f6f6cbfaacd8d903a..3833fff7e2a02f38eb7079b499fe8cd24d0043bb 100644 |
--- a/ui/aura/root_window_host_win.h |
+++ b/ui/aura/root_window_host_win.h |
@@ -12,11 +12,11 @@ |
namespace aura { |
-class RootWindowHostWin : public RootWindowHost, public gfx::WindowImpl { |
+class WindowTreeHostWin : public WindowTreeHost, public gfx::WindowImpl { |
public: |
- RootWindowHostWin(const gfx::Rect& bounds); |
- virtual ~RootWindowHostWin(); |
- // RootWindowHost: |
+ WindowTreeHostWin(const gfx::Rect& bounds); |
+ virtual ~WindowTreeHostWin(); |
+ // WindowTreeHost: |
virtual RootWindow* GetRootWindow() OVERRIDE; |
virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE; |
virtual void Show() OVERRIDE; |
@@ -40,7 +40,7 @@ class RootWindowHostWin : public RootWindowHost, public gfx::WindowImpl { |
virtual void PrepareForShutdown() OVERRIDE; |
private: |
- BEGIN_MSG_MAP_EX(RootWindowHostWin) |
+ BEGIN_MSG_MAP_EX(WindowTreeHostWin) |
// Range handlers must go first! |
MESSAGE_RANGE_HANDLER_EX(WM_MOUSEFIRST, WM_MOUSELAST, OnMouseRange) |
MESSAGE_RANGE_HANDLER_EX(WM_NCMOUSEMOVE, WM_NCXBUTTONDBLCLK, OnMouseRange) |
@@ -79,12 +79,12 @@ class RootWindowHostWin : public RootWindowHost, public gfx::WindowImpl { |
DWORD saved_window_style_; |
DWORD saved_window_ex_style_; |
- DISALLOW_COPY_AND_ASSIGN(RootWindowHostWin); |
+ DISALLOW_COPY_AND_ASSIGN(WindowTreeHostWin); |
}; |
namespace test { |
-// Set true to let RootWindowHostWin use a popup window |
+// Set true to let WindowTreeHostWin use a popup window |
// with no frame/title so that the window size and test's |
// expectations matches. |
AURA_EXPORT void SetUsePopupAsRootWindowForTest(bool use); |