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

Unified Diff: ui/ui.gyp

Issue 9773024: This patch implements Chromium's Aura gesture recognizer in terms of utouch-grail and utouch-frame … (Closed) Base URL: https://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 8 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/base/touch/touch_factory.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
===================================================================
--- ui/ui.gyp (revision 126124)
+++ ui/ui.gyp (working copy)
@@ -22,6 +22,8 @@
'../base/base.gyp:base_i18n',
'../base/base.gyp:base_static',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '../third_party/utouch-frame/utouch-frame.gyp:utouch-frame',
+ '../third_party/utouch-grail/utouch-grail.gyp:utouch-grail',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
@@ -211,6 +213,12 @@
'base/text/utf16_indexing.h',
'base/theme_provider.cc',
'base/theme_provider.h',
+ 'base/touch/axis.cc',
+ 'base/touch/axis.h',
+ 'base/touch/multi_touch_device.cc',
+ 'base/touch/multi_touch_device.h',
+ 'base/touch/multi_touch_device_x11.cc',
+ 'base/touch/multi_touch_device_x11.h',
'base/touch/touch_factory.cc',
'base/touch/touch_factory.h',
'base/ui_base_exports.cc',
@@ -404,6 +412,16 @@
'gfx/native_theme_aura.h',
]
}],
+ ['use_utouch==1', {
+ 'defines' : ['USE_UTOUCH'],
+ }, { #use_utouch!=1
+ 'dependencies!': [
+# '../build/linux/system.gyp:utouch_frame',
+# '../build/linux/system.gyp:utouch_grail',
+ '../third_party/utouch-frame/utouch-frame.gyp:utouch-frame',
+ '../third_party/utouch-grail/utouch-grail.gyp:utouch-grail',
+ ],
+ }],
['use_aura==1 and OS=="win"', {
'sources/': [
['exclude', 'base/dragdrop/os_exchange_data_provider_win.cc'],
« no previous file with comments | « ui/base/touch/touch_factory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698