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

Unified Diff: ui/ui.gyp

Issue 10919135: Move ash specific cursor code to CursorManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 8 years, 3 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/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 660855f45b8d5d7c48eb9a68eafc66f5eafcff97..cce7f230a4fa317d7fdbb1d15bff7b1939d5c9c2 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -137,6 +137,11 @@
'base/cocoa/window_size_constants.mm',
'base/cursor/cursor.cc',
'base/cursor/cursor.h',
+ 'base/cursor/cursor_loader.h',
+ 'base/cursor/cursor_loader_win.cc',
+ 'base/cursor/cursor_loader_win.h',
+ 'base/cursor/cursor_loader_x11.cc',
+ 'base/cursor/cursor_loader_x11.h',
'base/cursor/cursor_win.cc',
'base/cursor/cursor_x11.cc',
'base/dialogs/base_shell_dialog.cc',
@@ -539,6 +544,8 @@
'sources!': [
'base/cursor/cursor.cc',
'base/cursor/cursor.h',
+ 'base/cursor/cursor_loader_x11.cc',
+ 'base/cursor/cursor_loader_x11.h',
'base/cursor/cursor_win.cc',
'base/cursor/cursor_x11.cc',
'base/native_theme/native_theme_aura.cc',
@@ -743,6 +750,7 @@
}],
['toolkit_views==0', {
'sources!': [
+ 'base/event.cc',
'base/events/event.cc',
'base/events/event.h',
'base/x/events_x.cc',
oshima 2012/09/07 23:08:20 this is for aura as well?
mazda 2012/09/08 00:27:02 Remvoed base/event.cc, which was accidentally adde

Powered by Google App Engine
This is Rietveld 408576698