Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Side by Side Diff: ui/views/widget/desktop_aura/desktop_root_window_host_win.h

Issue 72503002: Remove some pass-thrus on RootWindow API in favor of exposing the RootWindowHost again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_WIN_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_WIN_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_WIN_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_WIN_H_
7 7
8 #include "ui/aura/client/animation_host.h" 8 #include "ui/aura/client/animation_host.h"
9 #include "ui/aura/window_tree_host.h" 9 #include "ui/aura/window_tree_host.h"
10 #include "ui/views/views_export.h" 10 #include "ui/views/views_export.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 virtual void SetWindowIcons(const gfx::ImageSkia& window_icon, 96 virtual void SetWindowIcons(const gfx::ImageSkia& window_icon,
97 const gfx::ImageSkia& app_icon) OVERRIDE; 97 const gfx::ImageSkia& app_icon) OVERRIDE;
98 virtual void InitModalType(ui::ModalType modal_type) OVERRIDE; 98 virtual void InitModalType(ui::ModalType modal_type) OVERRIDE;
99 virtual void FlashFrame(bool flash_frame) OVERRIDE; 99 virtual void FlashFrame(bool flash_frame) OVERRIDE;
100 virtual void OnRootViewLayout() const OVERRIDE; 100 virtual void OnRootViewLayout() const OVERRIDE;
101 virtual void OnNativeWidgetFocus() OVERRIDE; 101 virtual void OnNativeWidgetFocus() OVERRIDE;
102 virtual void OnNativeWidgetBlur() OVERRIDE; 102 virtual void OnNativeWidgetBlur() OVERRIDE;
103 virtual bool IsAnimatingClosed() const OVERRIDE; 103 virtual bool IsAnimatingClosed() const OVERRIDE;
104 104
105 // Overridden from aura::RootWindowHost: 105 // Overridden from aura::RootWindowHost:
106 virtual void SetDelegate(aura::RootWindowHostDelegate* delegate) OVERRIDE;
107 virtual aura::RootWindow* GetRootWindow() OVERRIDE; 106 virtual aura::RootWindow* GetRootWindow() OVERRIDE;
108 virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE; 107 virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
109 virtual void Show() OVERRIDE; 108 virtual void Show() OVERRIDE;
110 virtual void Hide() OVERRIDE; 109 virtual void Hide() OVERRIDE;
111 virtual void ToggleFullScreen() OVERRIDE; 110 virtual void ToggleFullScreen() OVERRIDE;
112 virtual gfx::Rect GetBounds() const OVERRIDE; 111 virtual gfx::Rect GetBounds() const OVERRIDE;
113 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; 112 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
114 virtual gfx::Insets GetInsets() const OVERRIDE; 113 virtual gfx::Insets GetInsets() const OVERRIDE;
115 virtual void SetInsets(const gfx::Insets& insets) OVERRIDE; 114 virtual void SetInsets(const gfx::Insets& insets) OVERRIDE;
116 virtual gfx::Point GetLocationOnNativeScreen() const OVERRIDE; 115 virtual gfx::Point GetLocationOnNativeScreen() const OVERRIDE;
117 virtual void SetCapture() OVERRIDE; 116 virtual void SetCapture() OVERRIDE;
118 virtual void ReleaseCapture() OVERRIDE; 117 virtual void ReleaseCapture() OVERRIDE;
119 virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE; 118 virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE;
120 virtual bool QueryMouseLocation(gfx::Point* location_return) OVERRIDE; 119 virtual bool QueryMouseLocation(gfx::Point* location_return) OVERRIDE;
121 virtual bool ConfineCursorToRootWindow() OVERRIDE; 120 virtual bool ConfineCursorToRootWindow() OVERRIDE;
122 virtual void UnConfineCursor() OVERRIDE; 121 virtual void UnConfineCursor() OVERRIDE;
123 virtual void OnCursorVisibilityChanged(bool show) OVERRIDE; 122 virtual void OnCursorVisibilityChanged(bool show) OVERRIDE;
124 virtual void MoveCursorTo(const gfx::Point& location) OVERRIDE; 123 virtual void MoveCursorTo(const gfx::Point& location) OVERRIDE;
125 virtual void SetFocusWhenShown(bool focus_when_shown) OVERRIDE;
126 virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE; 124 virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE;
127 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; 125 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
128 virtual void PrepareForShutdown() OVERRIDE; 126 virtual void PrepareForShutdown() OVERRIDE;
129 127
130 // Overridden from aura::client::AnimationHost 128 // Overridden from aura::client::AnimationHost
131 virtual void SetHostTransitionOffsets( 129 virtual void SetHostTransitionOffsets(
132 const gfx::Vector2d& top_left_delta, 130 const gfx::Vector2d& top_left_delta,
133 const gfx::Vector2d& bottom_right_delta) OVERRIDE; 131 const gfx::Vector2d& bottom_right_delta) OVERRIDE;
134 virtual void OnWindowHidingAnimationCompleted() OVERRIDE; 132 virtual void OnWindowHidingAnimationCompleted() OVERRIDE;
135 133
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 223
226 scoped_ptr<HWNDMessageHandler> message_handler_; 224 scoped_ptr<HWNDMessageHandler> message_handler_;
227 scoped_ptr<aura::client::FocusClient> focus_client_; 225 scoped_ptr<aura::client::FocusClient> focus_client_;
228 226
229 // TODO(beng): Consider providing an interface to DesktopNativeWidgetAura 227 // TODO(beng): Consider providing an interface to DesktopNativeWidgetAura
230 // instead of providing this route back to Widget. 228 // instead of providing this route back to Widget.
231 internal::NativeWidgetDelegate* native_widget_delegate_; 229 internal::NativeWidgetDelegate* native_widget_delegate_;
232 230
233 DesktopNativeWidgetAura* desktop_native_widget_aura_; 231 DesktopNativeWidgetAura* desktop_native_widget_aura_;
234 232
235 aura::RootWindowHostDelegate* root_window_host_delegate_;
236 aura::Window* content_window_; 233 aura::Window* content_window_;
237 234
238 // Owned by DesktopNativeWidgetAura. 235 // Owned by DesktopNativeWidgetAura.
239 DesktopDragDropClientWin* drag_drop_client_; 236 DesktopDragDropClientWin* drag_drop_client_;
240 237
241 // When certain windows are being shown, we augment the window size 238 // When certain windows are being shown, we augment the window size
242 // temporarily for animation. The following two members contain the top left 239 // temporarily for animation. The following two members contain the top left
243 // and bottom right offsets which are used to enlarge the window. 240 // and bottom right offsets which are used to enlarge the window.
244 gfx::Vector2d window_expansion_top_left_delta_; 241 gfx::Vector2d window_expansion_top_left_delta_;
245 gfx::Vector2d window_expansion_bottom_right_delta_; 242 gfx::Vector2d window_expansion_bottom_right_delta_;
(...skipping 17 matching lines...) Expand all
263 // Owned by TooltipController, but we need to forward events to it so we keep 260 // Owned by TooltipController, but we need to forward events to it so we keep
264 // a reference. 261 // a reference.
265 corewm::TooltipWin* tooltip_; 262 corewm::TooltipWin* tooltip_;
266 263
267 DISALLOW_COPY_AND_ASSIGN(DesktopRootWindowHostWin); 264 DISALLOW_COPY_AND_ASSIGN(DesktopRootWindowHostWin);
268 }; 265 };
269 266
270 } // namespace views 267 } // namespace views
271 268
272 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_WIN_H_ 269 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698