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

Unified Diff: webkit/glue/webkit_glue.gypi

Issue 9463003: aura-x11: Add custom web cursor support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 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
« ui/aura/cursor.h ('K') | « webkit/glue/webcursor_aurax11.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webkit_glue.gypi
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index c213ff08529d5ff888c4f3a59acecfd60d40ae93..ceee7d608dcbc6eca26459e196726b8ba48a9c5a 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -405,6 +405,8 @@
'webcursor.h',
'webcursor_android.cc',
'webcursor_aura.cc',
+ 'webcursor_aurawin.cc',
+ 'webcursor_aurax11.cc',
'webcursor_gtk.cc',
'webcursor_gtk_data.h',
'webcursor_mac.mm',
@@ -490,6 +492,9 @@
],
}],
['use_aura==1', {
+ 'dependencies': [
+ '<(DEPTH)/ui/aura/aura.gyp:aura',
+ ],
'sources/': [
['exclude', '^\\.\\./plugins/npapi/webplugin_delegate_impl_mac.mm'],
['exclude', '^\\.\\./plugins/npapi/webplugin_delegate_impl_win.cc'],
@@ -499,6 +504,11 @@
'webcursor_win.cc',
],
}],
+ ['use_aura==1 and use_x11==1', {
+ 'link_settings': {
+ 'libraries': [ '-lXcursor', ],
+ },
+ }],
['OS!="mac"', {
'sources/': [['exclude', '_mac\\.(cc|mm)$']],
'sources!': [
« ui/aura/cursor.h ('K') | « webkit/glue/webcursor_aurax11.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698