| Index: ui/views/widget/desktop_aura/desktop_root_window_host_win.h
|
| diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_win.h b/ui/views/widget/desktop_aura/desktop_root_window_host_win.h
|
| index 7352eb848b5f9c46d1005cfa22f135c318fdc2b3..e8cbf3f4e1f07c54982fde22137629b82ecabc56 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_root_window_host_win.h
|
| +++ b/ui/views/widget/desktop_aura/desktop_root_window_host_win.h
|
| @@ -28,22 +28,22 @@ namespace corewm {
|
| class TooltipWin;
|
| }
|
|
|
| -class VIEWS_EXPORT DesktopRootWindowHostWin
|
| - : public DesktopRootWindowHost,
|
| +class VIEWS_EXPORT DesktopWindowTreeHostWin
|
| + : public DesktopWindowTreeHost,
|
| public aura::client::AnimationHost,
|
| - public aura::RootWindowHost,
|
| + public aura::WindowTreeHost,
|
| public HWNDMessageHandlerDelegate {
|
| public:
|
| - DesktopRootWindowHostWin(
|
| + DesktopWindowTreeHostWin(
|
| internal::NativeWidgetDelegate* native_widget_delegate,
|
| DesktopNativeWidgetAura* desktop_native_widget_aura);
|
| - virtual ~DesktopRootWindowHostWin();
|
| + virtual ~DesktopWindowTreeHostWin();
|
|
|
| // A way of converting an HWND into a content window.
|
| static aura::Window* GetContentWindowForHWND(HWND hwnd);
|
|
|
| protected:
|
| - // Overridden from DesktopRootWindowHost:
|
| + // Overridden from DesktopWindowTreeHost:
|
| virtual void Init(aura::Window* content_window,
|
| const Widget::InitParams& params,
|
| aura::RootWindow::CreateParams* rw_create_params) OVERRIDE;
|
| @@ -54,7 +54,7 @@ class VIEWS_EXPORT DesktopRootWindowHostWin
|
| CreateDragDropClient(DesktopNativeCursorManager* cursor_manager) OVERRIDE;
|
| virtual void Close() OVERRIDE;
|
| virtual void CloseNow() OVERRIDE;
|
| - virtual aura::RootWindowHost* AsRootWindowHost() OVERRIDE;
|
| + virtual aura::WindowTreeHost* AsWindowTreeHost() OVERRIDE;
|
| virtual void ShowWindowWithState(ui::WindowShowState show_state) OVERRIDE;
|
| virtual void ShowMaximizedWithBounds(
|
| const gfx::Rect& restored_bounds) OVERRIDE;
|
| @@ -104,7 +104,7 @@ class VIEWS_EXPORT DesktopRootWindowHostWin
|
| virtual void OnNativeWidgetBlur() OVERRIDE;
|
| virtual bool IsAnimatingClosed() const OVERRIDE;
|
|
|
| - // Overridden from aura::RootWindowHost:
|
| + // Overridden from aura::WindowTreeHost:
|
| virtual aura::RootWindow* GetRootWindow() OVERRIDE;
|
| virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
|
| virtual void Show() OVERRIDE;
|
| @@ -273,7 +273,7 @@ class VIEWS_EXPORT DesktopRootWindowHostWin
|
|
|
| scoped_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(DesktopRootWindowHostWin);
|
| + DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostWin);
|
| };
|
|
|
| } // namespace views
|
|
|