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

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: Fix style 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
« no previous file with comments | « ui/gfx/ozone/surface_factory_ozone.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 841f382ac0afd237b5035d366c566ce4b5b75a49..8215df148976670573b1f33ca659654857a1970d 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -127,13 +127,13 @@
'base/cursor/cursor.h',
'base/cursor/cursor_android.cc',
'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',
@@ -536,13 +536,6 @@
'../build/linux/system.gyp:xrender', # For XRender* function calls in x11_util.cc.
],
}],
- ['use_ozone==0', {
- 'sources!': [
- 'base/cursor/cursor_null.cc',
- 'base/cursor/cursor_loader_null.cc',
- 'base/cursor/cursor_loader_null.h',
- ],
- }],
['toolkit_views==0', {
'sources!': [
'base/dragdrop/drop_target_event.cc',
« no previous file with comments | « 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