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

Unified Diff: ui/views/views.gyp

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, 10 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 side-by-side diff with in-line comments
Download patch
Index: ui/views/views.gyp
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 43cfdaa3058c66643cc69c5fa98293458d7caec5..0c37795a8970d4b97a3c8070bc17d112ec8e60b8 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -229,6 +229,8 @@
'corewm/compound_event_filter.h',
'corewm/corewm_switches.cc',
'corewm/corewm_switches.h',
+ 'corewm/cursor_manager.cc',
+ 'corewm/cursor_manager.h',
'corewm/focus_controller.cc',
'corewm/focus_controller.h',
'corewm/focus_rules.h',
@@ -236,6 +238,8 @@
'corewm/image_grid.h',
'corewm/input_method_event_filter.cc',
'corewm/input_method_event_filter.h',
+ 'corewm/native_cursor_manager.h',
+ 'corewm/native_cursor_manager_delegate.h',
'corewm/shadow.cc',
'corewm/shadow.h',
'corewm/shadow_controller.cc',
@@ -337,8 +341,6 @@
'widget/default_theme_provider.h',
'widget/desktop_aura/desktop_activation_client.cc',
'widget/desktop_aura/desktop_activation_client.h',
- 'widget/desktop_aura/desktop_cursor_client.cc',
- 'widget/desktop_aura/desktop_cursor_client.h',
'widget/desktop_aura/desktop_dispatcher_client.cc',
'widget/desktop_aura/desktop_dispatcher_client.h',
'widget/desktop_aura/desktop_drag_drop_client_win.cc',
@@ -349,6 +351,8 @@
'widget/desktop_aura/desktop_focus_rules.h',
'widget/desktop_aura/desktop_layout_manager.cc',
'widget/desktop_aura/desktop_layout_manager.h',
+ 'widget/desktop_aura/desktop_native_cursor_manager.cc',
+ 'widget/desktop_aura/desktop_native_cursor_manager.h',
'widget/desktop_aura/desktop_native_widget_aura.cc',
'widget/desktop_aura/desktop_native_widget_aura.h',
'widget/desktop_aura/desktop_root_window_host.h',
@@ -664,6 +668,7 @@
'controls/textfield/textfield_views_model_unittest.cc',
'controls/tree/tree_view_unittest.cc',
'corewm/compound_event_filter_unittest.cc',
+ 'corewm/cursor_manager_unittest.cc',
'corewm/focus_controller_unittest.cc',
'corewm/image_grid_unittest.cc',
'corewm/input_method_event_filter_unittest.cc',
« no previous file with comments | « ui/views/corewm/native_cursor_manager_delegate.h ('k') | ui/views/widget/desktop_aura/desktop_cursor_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698