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

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

Issue 111043002: Cursor state should be global for desktop Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Test added Created 7 years 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_NATIVE_WIDGET_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
7 7
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "ui/aura/client/activation_change_observer.h" 9 #include "ui/aura/client/activation_change_observer.h"
10 #include "ui/aura/client/activation_delegate.h" 10 #include "ui/aura/client/activation_delegate.h"
(...skipping 23 matching lines...) Expand all
34 class InputMethodEventFilter; 34 class InputMethodEventFilter;
35 class ShadowController; 35 class ShadowController;
36 class TooltipController; 36 class TooltipController;
37 class VisibilityController; 37 class VisibilityController;
38 class WindowModalityController; 38 class WindowModalityController;
39 } 39 }
40 40
41 class DesktopCaptureClient; 41 class DesktopCaptureClient;
42 class DesktopDispatcherClient; 42 class DesktopDispatcherClient;
43 class DesktopEventClient; 43 class DesktopEventClient;
44 class DesktopNativeCursorManager;
44 class DesktopRootWindowHost; 45 class DesktopRootWindowHost;
45 class DropHelper; 46 class DropHelper;
46 class FocusManagerEventHandler; 47 class FocusManagerEventHandler;
47 class TooltipManagerAura; 48 class TooltipManagerAura;
48 class WindowReorderer; 49 class WindowReorderer;
49 50
50 class VIEWS_EXPORT DesktopNativeWidgetAura 51 class VIEWS_EXPORT DesktopNativeWidgetAura
51 : public internal::NativeWidgetPrivate, 52 : public internal::NativeWidgetPrivate,
52 public aura::WindowDelegate, 53 public aura::WindowDelegate,
53 public aura::client::ActivationDelegate, 54 public aura::client::ActivationDelegate,
(...skipping 16 matching lines...) Expand all
70 // Called from ~DesktopRootWindowHost. This takes the RootWindow as by the 71 // Called from ~DesktopRootWindowHost. This takes the RootWindow as by the
71 // time we get here |root_window_| is NULL. 72 // time we get here |root_window_| is NULL.
72 virtual void OnDesktopRootWindowHostDestroyed(aura::RootWindow* root); 73 virtual void OnDesktopRootWindowHostDestroyed(aura::RootWindow* root);
73 74
74 corewm::InputMethodEventFilter* input_method_event_filter() { 75 corewm::InputMethodEventFilter* input_method_event_filter() {
75 return input_method_event_filter_.get(); 76 return input_method_event_filter_.get();
76 } 77 }
77 corewm::CompoundEventFilter* root_window_event_filter() { 78 corewm::CompoundEventFilter* root_window_event_filter() {
78 return root_window_event_filter_; 79 return root_window_event_filter_;
79 } 80 }
81 aura::RootWindow* root_window() {
82 return root_window_.get();
83 }
80 84
81 // Overridden from NativeWidget: 85 // Overridden from NativeWidget:
82 virtual ui::EventHandler* GetEventHandler() OVERRIDE; 86 virtual ui::EventHandler* GetEventHandler() OVERRIDE;
83 87
84 // Ensures that the correct window is activated/deactivated based on whether 88 // Ensures that the correct window is activated/deactivated based on whether
85 // we are being activated/deactivated. 89 // we are being activated/deactivated.
86 void HandleActivationChanged(bool active); 90 void HandleActivationChanged(bool active);
87 91
88 protected: 92 protected:
89 // Overridden from internal::NativeWidgetPrivate: 93 // Overridden from internal::NativeWidgetPrivate:
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 262
259 // Child of |content_window_container_|. This is the return value from 263 // Child of |content_window_container_|. This is the return value from
260 // GetNativeView(). 264 // GetNativeView().
261 // WARNING: this may be NULL, in particular during shutdown it becomes NULL. 265 // WARNING: this may be NULL, in particular during shutdown it becomes NULL.
262 aura::Window* content_window_; 266 aura::Window* content_window_;
263 267
264 internal::NativeWidgetDelegate* native_widget_delegate_; 268 internal::NativeWidgetDelegate* native_widget_delegate_;
265 269
266 scoped_ptr<aura::client::FocusClient> focus_client_; 270 scoped_ptr<aura::client::FocusClient> focus_client_;
267 scoped_ptr<DesktopDispatcherClient> dispatcher_client_; 271 scoped_ptr<DesktopDispatcherClient> dispatcher_client_;
268 scoped_ptr<views::corewm::CursorManager> cursor_client_;
269 scoped_ptr<aura::client::ScreenPositionClient> position_client_; 272 scoped_ptr<aura::client::ScreenPositionClient> position_client_;
270 scoped_ptr<aura::client::DragDropClient> drag_drop_client_; 273 scoped_ptr<aura::client::DragDropClient> drag_drop_client_;
271 scoped_ptr<aura::client::WindowTreeClient> window_tree_client_; 274 scoped_ptr<aura::client::WindowTreeClient> window_tree_client_;
272 scoped_ptr<DesktopEventClient> event_client_; 275 scoped_ptr<DesktopEventClient> event_client_;
273 scoped_ptr<FocusManagerEventHandler> focus_manager_event_handler_; 276 scoped_ptr<FocusManagerEventHandler> focus_manager_event_handler_;
274 277
275 // Toplevel event filter which dispatches to other event filters. 278 // Toplevel event filter which dispatches to other event filters.
276 corewm::CompoundEventFilter* root_window_event_filter_; 279 corewm::CompoundEventFilter* root_window_event_filter_;
277 280
278 scoped_ptr<corewm::InputMethodEventFilter> input_method_event_filter_; 281 scoped_ptr<corewm::InputMethodEventFilter> input_method_event_filter_;
279 282
280 scoped_ptr<DropHelper> drop_helper_; 283 scoped_ptr<DropHelper> drop_helper_;
281 int last_drop_operation_; 284 int last_drop_operation_;
282 285
283 scoped_ptr<corewm::TooltipController> tooltip_controller_; 286 scoped_ptr<corewm::TooltipController> tooltip_controller_;
284 scoped_ptr<TooltipManagerAura> tooltip_manager_; 287 scoped_ptr<TooltipManagerAura> tooltip_manager_;
285 288
286 scoped_ptr<views::corewm::VisibilityController> visibility_controller_; 289 scoped_ptr<views::corewm::VisibilityController> visibility_controller_;
287 290
288 scoped_ptr<views::corewm::WindowModalityController> 291 scoped_ptr<views::corewm::WindowModalityController>
289 window_modality_controller_; 292 window_modality_controller_;
290 293
291 // See comments in OnLostActive(). 294 // See comments in OnLostActive().
292 bool restore_focus_on_activate_; 295 bool restore_focus_on_activate_;
293 296
294 gfx::NativeCursor cursor_; 297 gfx::NativeCursor cursor_;
298 static views::corewm::CursorManager* cursor_manager_;
299 static views::DesktopNativeCursorManager* native_cursor_manager_;
295 300
296 scoped_ptr<corewm::ShadowController> shadow_controller_; 301 scoped_ptr<corewm::ShadowController> shadow_controller_;
297 302
298 // Reorders child windows of |window_| associated with a view based on the 303 // Reorders child windows of |window_| associated with a view based on the
299 // order of the associated views in the widget's view hierarchy. 304 // order of the associated views in the widget's view hierarchy.
300 scoped_ptr<WindowReorderer> window_reorderer_; 305 scoped_ptr<WindowReorderer> window_reorderer_;
301 306
302 // See class documentation for Widget in widget.h for a note about type. 307 // See class documentation for Widget in widget.h for a note about type.
303 Widget::InitParams::Type widget_type_; 308 Widget::InitParams::Type widget_type_;
304 309
305 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); 310 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
306 }; 311 };
307 312
308 } // namespace views 313 } // namespace views
309 314
310 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 315 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698