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

Unified Diff: ui/ui.gyp

Issue 127043005: Adds NOTIMPLEMENTED cursor for android and includes path (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clipboard_android->cursor_android Created 6 years, 11 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/gfx.gyp ('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 fd1b70120acfb3a6cc5d54e834959c6ad1091c79..d8129c46d5fda2482060b4e6b96ec7703da64dc7 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -125,6 +125,7 @@
'base/cocoa/window_size_constants.mm',
'base/cursor/cursor.cc',
'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',
@@ -586,6 +587,11 @@
'android/ui_android.gyp:ui_java',
],
}],
+ ['OS=="android" and use_aura==0', {
+ 'sources!': [
+ 'base/cursor/cursor_android.cc'
+ ],
+ }],
['OS=="android" or OS=="ios"', {
'sources!': [
'base/device_form_factor_desktop.cc'
« no previous file with comments | « ui/gfx/gfx.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698