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

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

Issue 12263050: Rework ash::CursorManager into a corewm object, to share code with desktop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 7 years, 9 months 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/root_window_host.h" 8 #include "ui/aura/root_window_host.h"
9 #include "ui/views/views_export.h" 9 #include "ui/views/views_export.h"
10 #include "ui/views/widget/desktop_aura/desktop_root_window_host.h" 10 #include "ui/views/widget/desktop_aura/desktop_root_window_host.h"
11 #include "ui/views/win/hwnd_message_handler_delegate.h" 11 #include "ui/views/win/hwnd_message_handler_delegate.h"
12 12
13 namespace aura { 13 namespace aura {
14 namespace client { 14 namespace client {
15 class DefaultCaptureClient; 15 class DefaultCaptureClient;
16 class FocusClient; 16 class FocusClient;
17 class ScreenPositionClient; 17 class ScreenPositionClient;
18 } 18 }
19 } 19 }
20 20
21 namespace views { 21 namespace views {
22 class DesktopActivationClient; 22 class DesktopActivationClient;
23 class DesktopCursorClient; 23 class DesktopCursorClient;
24 class DesktopDispatcherClient; 24 class DesktopDispatcherClient;
25 class DesktopDragDropClientWin; 25 class DesktopDragDropClientWin;
26 class HWNDMessageHandler; 26 class HWNDMessageHandler;
27 27
28 namespace corewm {
29 class CursorManager;
30 }
31
28 class VIEWS_EXPORT DesktopRootWindowHostWin 32 class VIEWS_EXPORT DesktopRootWindowHostWin
29 : public DesktopRootWindowHost, 33 : public DesktopRootWindowHost,
30 public aura::RootWindowHost, 34 public aura::RootWindowHost,
31 public HWNDMessageHandlerDelegate { 35 public HWNDMessageHandlerDelegate {
32 public: 36 public:
33 DesktopRootWindowHostWin( 37 DesktopRootWindowHostWin(
34 internal::NativeWidgetDelegate* native_widget_delegate, 38 internal::NativeWidgetDelegate* native_widget_delegate,
35 DesktopNativeWidgetAura* desktop_native_widget_aura, 39 DesktopNativeWidgetAura* desktop_native_widget_aura,
36 const gfx::Rect& initial_bounds); 40 const gfx::Rect& initial_bounds);
37 virtual ~DesktopRootWindowHostWin(); 41 virtual ~DesktopRootWindowHostWin();
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 223
220 DesktopNativeWidgetAura* desktop_native_widget_aura_; 224 DesktopNativeWidgetAura* desktop_native_widget_aura_;
221 225
222 aura::RootWindowHostDelegate* root_window_host_delegate_; 226 aura::RootWindowHostDelegate* root_window_host_delegate_;
223 aura::Window* content_window_; 227 aura::Window* content_window_;
224 228
225 // In some cases, we set a screen position client on |root_window_|. If we 229 // In some cases, we set a screen position client on |root_window_|. If we
226 // do, we're responsible for the lifetime. 230 // do, we're responsible for the lifetime.
227 scoped_ptr<aura::client::ScreenPositionClient> position_client_; 231 scoped_ptr<aura::client::ScreenPositionClient> position_client_;
228 232
229 // A simple cursor client which just forwards events to the RootWindow. 233 // Controls visibility of the cursor.
230 scoped_ptr<DesktopCursorClient> cursor_client_; 234 scoped_ptr<views::corewm::CursorManager> cursor_client_;
231 235
232 scoped_ptr<DesktopDragDropClientWin> drag_drop_client_; 236 scoped_ptr<DesktopDragDropClientWin> drag_drop_client_;
233 237
234 DISALLOW_COPY_AND_ASSIGN(DesktopRootWindowHostWin); 238 DISALLOW_COPY_AND_ASSIGN(DesktopRootWindowHostWin);
235 }; 239 };
236 240
237 } // namespace views 241 } // namespace views
238 242
239 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_WIN_H_ 243 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698