Move root_window_host* in aura to window_tree_host*.

ui/views/widget/desktop_aura/desktop_root_window_host_win.h

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
deleted file mode 100644
index 4eb7b34caaa4f983b4d82b14482c6ed83449b100..0000000000000000000000000000000000000000
--- a/ui/views/widget/desktop_aura/desktop_root_window_host_win.h
+++ /dev/null
@@ -1,290 +0,0 @@
-// 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_ROOT_WINDOW_HOST_WIN_H_
-#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_WIN_H_
-
-#include "ui/aura/client/animation_host.h"
-#include "ui/aura/window_tree_host.h"
-#include "ui/views/views_export.h"
-#include "ui/views/widget/desktop_aura/desktop_root_window_host.h"
-#include "ui/views/win/hwnd_message_handler_delegate.h"
-
-namespace aura {
-namespace client {
-class DragDropClient;
-class FocusClient;
-class ScopedTooltipDisabler;
-}
-}
-
-namespace views {
-class DesktopCursorClient;
-class DesktopDragDropClientWin;
-class HWNDMessageHandler;
-
-namespace corewm {
-class TooltipWin;
-}
-
-class VIEWS_EXPORT DesktopWindowTreeHostWin
-    : public DesktopWindowTreeHost,
-      public aura::client::AnimationHost,
-      public aura::WindowTreeHost,
-      public ui::EventSource,
-      public HWNDMessageHandlerDelegate {
- public:
-  DesktopWindowTreeHostWin(
-      internal::NativeWidgetDelegate* native_widget_delegate,
-      DesktopNativeWidgetAura* desktop_native_widget_aura);
-  virtual ~DesktopWindowTreeHostWin();
-
-  // A way of converting an HWND into a content window.
-  static aura::Window* GetContentWindowForHWND(HWND hwnd);
-
- protected:
-  // Overridden from DesktopWindowTreeHost:
-  virtual void Init(aura::Window* content_window,
-                    const Widget::InitParams& params,
-                    aura::RootWindow::CreateParams* rw_create_params) OVERRIDE;
-  virtual void OnRootWindowCreated(aura::RootWindow* root,
-                                   const Widget::InitParams& params) OVERRIDE;
-  virtual scoped_ptr<corewm::Tooltip> CreateTooltip() OVERRIDE;
-  virtual scoped_ptr<aura::client::DragDropClient>
-      CreateDragDropClient(DesktopNativeCursorManager* cursor_manager) OVERRIDE;
-  virtual void Close() OVERRIDE;
-  virtual void CloseNow() OVERRIDE;
-  virtual aura::WindowTreeHost* AsWindowTreeHost() OVERRIDE;
-  virtual void ShowWindowWithState(ui::WindowShowState show_state) OVERRIDE;
-  virtual void ShowMaximizedWithBounds(
-      const gfx::Rect& restored_bounds) OVERRIDE;
-  virtual bool IsVisible() const OVERRIDE;
-  virtual void SetSize(const gfx::Size& size) OVERRIDE;
-  virtual void StackAtTop() OVERRIDE;
-  virtual void CenterWindow(const gfx::Size& size) OVERRIDE;
-  virtual void GetWindowPlacement(
-      gfx::Rect* bounds,
-      ui::WindowShowState* show_state) const OVERRIDE;
-  virtual gfx::Rect GetWindowBoundsInScreen() const OVERRIDE;
-  virtual gfx::Rect GetClientAreaBoundsInScreen() const OVERRIDE;
-  virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
-  virtual gfx::Rect GetWorkAreaBoundsInScreen() const OVERRIDE;
-  virtual void SetShape(gfx::NativeRegion native_region) OVERRIDE;
-  virtual void Activate() OVERRIDE;
-  virtual void Deactivate() OVERRIDE;
-  virtual bool IsActive() const OVERRIDE;
-  virtual void Maximize() OVERRIDE;
-  virtual void Minimize() OVERRIDE;
-  virtual void Restore() OVERRIDE;
-  virtual bool IsMaximized() const OVERRIDE;
-  virtual bool IsMinimized() const OVERRIDE;
-  virtual bool HasCapture() const OVERRIDE;
-  virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE;
-  virtual bool IsAlwaysOnTop() const OVERRIDE;
-  virtual bool SetWindowTitle(const base::string16& title) OVERRIDE;
-  virtual void ClearNativeFocus() OVERRIDE;
-  virtual Widget::MoveLoopResult RunMoveLoop(
-      const gfx::Vector2d& drag_offset,
-      Widget::MoveLoopSource source,
-      Widget::MoveLoopEscapeBehavior escape_behavior) OVERRIDE;
-  virtual void EndMoveLoop() OVERRIDE;
-  virtual void SetVisibilityChangedAnimationsEnabled(bool value) OVERRIDE;
-  virtual bool ShouldUseNativeFrame() const OVERRIDE;
-  virtual bool ShouldWindowContentsBeTransparent() const OVERRIDE;
-  virtual void FrameTypeChanged() OVERRIDE;
-  virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE;
-  virtual void SetFullscreen(bool fullscreen) OVERRIDE;
-  virtual bool IsFullscreen() const OVERRIDE;
-  virtual void SetOpacity(unsigned char opacity) OVERRIDE;
-  virtual void SetWindowIcons(const gfx::ImageSkia& window_icon,
-                              const gfx::ImageSkia& app_icon) OVERRIDE;
-  virtual void InitModalType(ui::ModalType modal_type) OVERRIDE;
-  virtual void FlashFrame(bool flash_frame) OVERRIDE;
-  virtual void OnRootViewLayout() const OVERRIDE;
-  virtual void OnNativeWidgetFocus() OVERRIDE;
-  virtual void OnNativeWidgetBlur() OVERRIDE;
-  virtual bool IsAnimatingClosed() const OVERRIDE;
-
-  // Overridden from aura::WindowTreeHost:
-  virtual aura::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;
-  virtual void SetCapture() OVERRIDE;
-  virtual void ReleaseCapture() OVERRIDE;
-  virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE;
-  virtual bool QueryMouseLocation(gfx::Point* location_return) OVERRIDE;
-  virtual bool ConfineCursorToRootWindow() OVERRIDE;
-  virtual void UnConfineCursor() OVERRIDE;
-  virtual void OnCursorVisibilityChanged(bool show) OVERRIDE;
-  virtual void MoveCursorTo(const gfx::Point& location) OVERRIDE;
-  virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE;
-  virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
-  virtual void PrepareForShutdown() OVERRIDE;
-
-  // Overridden frm ui::EventSource
-  virtual ui::EventProcessor* GetEventProcessor() OVERRIDE;
-
-  // Overridden from aura::client::AnimationHost
-  virtual void SetHostTransitionOffsets(
-      const gfx::Vector2d& top_left_delta,
-      const gfx::Vector2d& bottom_right_delta) OVERRIDE;
-  virtual void OnWindowHidingAnimationCompleted() OVERRIDE;
-
-  // Overridden from HWNDMessageHandlerDelegate:
-  virtual bool IsWidgetWindow() const OVERRIDE;
-  virtual bool IsUsingCustomFrame() const OVERRIDE;
-  virtual void SchedulePaint() OVERRIDE;
-  virtual void EnableInactiveRendering() OVERRIDE;
-  virtual bool IsInactiveRenderingDisabled() OVERRIDE;
-  virtual bool CanResize() const OVERRIDE;
-  virtual bool CanMaximize() const OVERRIDE;
-  virtual bool CanActivate() const OVERRIDE;
-  virtual bool WidgetSizeIsClientSize() const OVERRIDE;
-  virtual bool CanSaveFocus() const OVERRIDE;
-  virtual void SaveFocusOnDeactivate() OVERRIDE;
-  virtual void RestoreFocusOnActivate() OVERRIDE;
-  virtual void RestoreFocusOnEnable() OVERRIDE;
-  virtual bool IsModal() const OVERRIDE;
-  virtual int GetInitialShowState() const OVERRIDE;
-  virtual bool WillProcessWorkAreaChange() const OVERRIDE;
-  virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE;
-  virtual void GetWindowMask(const gfx::Size& size, gfx::Path* path) OVERRIDE;
-  virtual bool GetClientAreaInsets(gfx::Insets* insets) const OVERRIDE;
-  virtual void GetMinMaxSize(gfx::Size* min_size,
-                             gfx::Size* max_size) const OVERRIDE;
-  virtual gfx::Size GetRootViewSize() const OVERRIDE;
-  virtual void ResetWindowControls() OVERRIDE;
-  virtual void PaintLayeredWindow(gfx::Canvas* canvas) OVERRIDE;
-  virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE;
-  virtual bool ShouldHandleSystemCommands() const OVERRIDE;
-  virtual InputMethod* GetInputMethod() OVERRIDE;
-  virtual void HandleAppDeactivated() OVERRIDE;
-  virtual void HandleActivationChanged(bool active) OVERRIDE;
-  virtual bool HandleAppCommand(short command) OVERRIDE;
-  virtual void HandleCancelMode() OVERRIDE;
-  virtual void HandleCaptureLost() OVERRIDE;
-  virtual void HandleClose() OVERRIDE;
-  virtual bool HandleCommand(int command) OVERRIDE;
-  virtual void HandleAccelerator(const ui::Accelerator& accelerator) OVERRIDE;
-  virtual void HandleCreate() OVERRIDE;
-  virtual void HandleDestroying() OVERRIDE;
-  virtual void HandleDestroyed() OVERRIDE;
-  virtual bool HandleInitialFocus(ui::WindowShowState show_state) OVERRIDE;
-  virtual void HandleDisplayChange() OVERRIDE;
-  virtual void HandleBeginWMSizeMove() OVERRIDE;
-  virtual void HandleEndWMSizeMove() OVERRIDE;
-  virtual void HandleMove() OVERRIDE;
-  virtual void HandleWorkAreaChanged() OVERRIDE;
-  virtual void HandleVisibilityChanging(bool visible) OVERRIDE;
-  virtual void HandleVisibilityChanged(bool visible) OVERRIDE;
-  virtual void HandleClientSizeChanged(const gfx::Size& new_size) OVERRIDE;
-  virtual void HandleFrameChanged() OVERRIDE;
-  virtual void HandleNativeFocus(HWND last_focused_window) OVERRIDE;
-  virtual void HandleNativeBlur(HWND focused_window) OVERRIDE;
-  virtual bool HandleMouseEvent(const ui::MouseEvent& event) OVERRIDE;
-  virtual bool HandleKeyEvent(const ui::KeyEvent& event) OVERRIDE;
-  virtual bool HandleUntranslatedKeyEvent(const ui::KeyEvent& event) OVERRIDE;
-  virtual void HandleTouchEvent(const ui::TouchEvent& event) OVERRIDE;
-  virtual bool HandleIMEMessage(UINT message,
-                                WPARAM w_param,
-                                LPARAM l_param,
-                                LRESULT* result) OVERRIDE;
-  virtual void HandleInputLanguageChange(DWORD character_set,
-                                         HKL input_language_id) OVERRIDE;
-  virtual bool HandlePaintAccelerated(const gfx::Rect& invalid_rect) OVERRIDE;
-  virtual void HandlePaint(gfx::Canvas* canvas) OVERRIDE;
-  virtual bool HandleTooltipNotify(int w_param,
-                                   NMHDR* l_param,
-                                   LRESULT* l_result) OVERRIDE;
-  virtual void HandleTooltipMouseMove(UINT message,
-                                      WPARAM w_param,
-                                      LPARAM l_param) OVERRIDE;
-  virtual void HandleMenuLoop(bool in_menu_loop) OVERRIDE;
-  virtual bool PreHandleMSG(UINT message,
-                            WPARAM w_param,
-                            LPARAM l_param,
-                            LRESULT* result) OVERRIDE;
-  virtual void PostHandleMSG(UINT message,
-                             WPARAM w_param,
-                             LPARAM l_param) OVERRIDE;
-  virtual bool HandleScrollEvent(const ui::ScrollEvent& event) OVERRIDE;
-
-  Widget* GetWidget();
-  const Widget* GetWidget() const;
-  HWND GetHWND() const;
-
- private:
-  void SetWindowTransparency();
-
-  // Returns true if a modal window is active in the current root window chain.
-  bool IsModalWindowActive() const;
-
-  // We are owned by the RootWindow, but we have to have a back pointer to it.
-  aura::RootWindow* root_window_;
-
-  scoped_ptr<HWNDMessageHandler> message_handler_;
-  scoped_ptr<aura::client::FocusClient> focus_client_;
-
-  // TODO(beng): Consider providing an interface to DesktopNativeWidgetAura
-  //             instead of providing this route back to Widget.
-  internal::NativeWidgetDelegate* native_widget_delegate_;
-
-  DesktopNativeWidgetAura* desktop_native_widget_aura_;
-
-  aura::Window* content_window_;
-
-  // Owned by DesktopNativeWidgetAura.
-  DesktopDragDropClientWin* drag_drop_client_;
-
-  // When certain windows are being shown, we augment the window size
-  // temporarily for animation. The following two members contain the top left
-  // and bottom right offsets which are used to enlarge the window.
-  gfx::Vector2d window_expansion_top_left_delta_;
-  gfx::Vector2d window_expansion_bottom_right_delta_;
-
-  // Windows are enlarged to be at least 64x64 pixels, so keep track of the
-  // extra added here.
-  gfx::Vector2d window_enlargement_;
-
-  // Whether the window close should be converted to a hide, and then actually
-  // closed on the completion of the hide animation. This is cached because
-  // the property is set on the contained window which has a shorter lifetime.
-  bool should_animate_window_close_;
-
-  // When Close()d and animations are being applied to this window, the close
-  // of the window needs to be deferred to when the close animation is
-  // completed. This variable indicates that a Close was converted to a Hide,
-  // so that when the Hide is completed the host window should be closed.
-  bool pending_close_;
-
-  // True if the widget is going to have a non_client_view. We cache this value
-  // rather than asking the Widget for the non_client_view so that we know at
-  // Init time, before the Widget has created the NonClientView.
-  bool has_non_client_view_;
-
-  // Owned by TooltipController, but we need to forward events to it so we keep
-  // a reference.
-  corewm::TooltipWin* tooltip_;
-
-  // Visibility of the cursor. On Windows we can have multiple root windows and
-  // the implementation of ::ShowCursor() is based on a counter, so making this
-  // member static ensures that ::ShowCursor() is always called exactly once
-  // whenever the cursor visibility state changes.
-  static bool is_cursor_visible_;
-
-  scoped_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_;
-
-  DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostWin);
-};
-
-}  // namespace views
-
-#endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_WIN_H_