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

Unified 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: Updated patch 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 side-by-side diff with in-line comments
Download patch
Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.h
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
index 494dbc41a0e59e777e55bd0be39bc80c32488043..ca4bca2105da76e44b19bc389d8cb380f04fde99 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
@@ -41,6 +41,7 @@ class WindowModalityController;
class DesktopCaptureClient;
class DesktopDispatcherClient;
class DesktopEventClient;
+class DesktopNativeCursorManager;
class DesktopRootWindowHost;
class DropHelper;
class FocusManagerEventHandler;
@@ -77,6 +78,9 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
corewm::CompoundEventFilter* root_window_event_filter() {
return root_window_event_filter_;
}
+ aura::RootWindow* root_window() {
+ return root_window_.get();
+ }
// Overridden from NativeWidget:
virtual ui::EventHandler* GetEventHandler() OVERRIDE;
@@ -265,7 +269,6 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
scoped_ptr<aura::client::FocusClient> focus_client_;
scoped_ptr<DesktopDispatcherClient> dispatcher_client_;
- scoped_ptr<views::corewm::CursorManager> cursor_client_;
scoped_ptr<aura::client::ScreenPositionClient> position_client_;
scoped_ptr<aura::client::DragDropClient> drag_drop_client_;
scoped_ptr<aura::client::WindowTreeClient> window_tree_client_;
@@ -292,6 +295,8 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
bool restore_focus_on_activate_;
gfx::NativeCursor cursor_;
+ static views::corewm::CursorManager* cursor_manager_;
+ static views::DesktopNativeCursorManager* native_cursor_manager_;
scoped_ptr<corewm::ShadowController> shadow_controller_;

Powered by Google App Engine
This is Rietveld 408576698