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

Unified Diff: ui/ui.gyp

Issue 158023006: Adding Ozone CursorLoader and necessary API functions to allow setting the cursor in SoftwareFactor… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index e731809d341d1d81876247dc3d712411b9f307af..6f97e12515f0772ead01861c86f70c4015cd960c 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -129,11 +129,14 @@
'base/cursor/cursor_loader.h',
'base/cursor/cursor_loader_null.cc',
'base/cursor/cursor_loader_null.h',
+ 'base/cursor/cursor_loader_ozone.cc',
+ 'base/cursor/cursor_loader_ozone.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_null.cc',
+ 'base/cursor/cursor_ozone.cc',
'base/cursor/cursor_mac.mm',
'base/cursor/cursor_win.cc',
'base/cursor/cursor_x11.cc',
@@ -546,7 +549,7 @@
'../build/linux/system.gyp:xrender', # For XRender* function calls in x11_util.cc.
],
}],
- ['use_ozone==0', {
+ ['OS=="android" or OS=="mac" or OS=="win" or use_ozone==1 or use_x11==1', {
rjkroege 2014/02/11 21:57:55 what platforms continue to use cursor_null* with t
dnicoara 2014/02/12 16:18:19 Not sure if there are any left. I've removed the *
'sources!': [
'base/cursor/cursor_null.cc',
'base/cursor/cursor_loader_null.cc',
« ui/base/cursor/cursor_loader_ozone.cc ('K') | « ui/gfx/ozone/surface_factory_ozone.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698