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/aura/aura.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, 9 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/aura/aura.gyp
===================================================================
--- ui/aura/aura.gyp (revision 126124)
+++ ui/aura/aura.gyp (working copy)
@@ -14,6 +14,8 @@
'../../base/base.gyp:base',
'../../base/base.gyp:base_i18n',
'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '../../build/linux/system.gyp:frame',
+ '../../build/linux/system.gyp:grail',
'../../skia/skia.gyp:skia',
'../gfx/compositor/compositor.gyp:compositor',
'../ui.gyp:gfx_resources',
@@ -63,14 +65,16 @@
'gestures/gesture_configuration.cc',
'gestures/gesture_configuration.h',
'gestures/gesture_recognizer.h',
- 'gestures/gesture_recognizer_aura.cc',
+ 'gestures/gesture_point.cc',
rjkroege 2012/04/02 17:05:15 preserve the alphabetic order?
+ 'gestures/gesture_point.h',
+ 'gestures/gesture_recognizer_aura.cc',
'gestures/gesture_recognizer_aura.h',
- 'gestures/gesture_point.cc',
- 'gestures/gesture_point.h',
- 'gestures/velocity_calculator.cc',
- 'gestures/velocity_calculator.h',
- 'gestures/gesture_sequence.cc',
- 'gestures/gesture_sequence.h',
+ 'gestures/gesture_recognizer_grail.cc',
+ 'gestures/gesture_recognizer_grail.h',
+ 'gestures/gesture_sequence.cc',
+ 'gestures/gesture_sequence.h',
+ 'gestures/velocity_calculator.cc',
+ 'gestures/velocity_calculator.h',
'layout_manager.cc',
'layout_manager.h',
'root_window_host.h',
@@ -100,6 +104,30 @@
['exclude', 'client/dispatcher_client.h'],
],
}],
+ ['use_utouch==1', {
+ 'sources!': [
+ 'gestures/gesture_point.cc',
+ 'gestures/gesture_point.h',
+ 'gestures/gesture_recognizer_aura.cc',
+ 'gestures/gesture_recognizer_aura.h',
+ 'gestures/gesture_sequence.cc',
+ 'gestures/gesture_sequence.h',
+ 'gestures/velocity_calculator.cc',
+ 'gestures/velocity_calculator.h',
+ ],
+ 'defines': [
+ 'USE_UTOUCH',
+ ],
+ 'dependencies': [
+ '../../build/linux/system.gyp:frame',
+ '../../build/linux/system.gyp:grail',
+ ],
+ }, { #use_utouch!=1
rjkroege 2012/04/02 17:05:15 shouldn't you be excluding the frame / grail depen
+ 'sources!': [
+ 'gestures/gesture_recognizer_grail.cc',
+ 'gestures/gesture_recognizer_grail.h',
+ ],
+ }],
],
},
{

Powered by Google App Engine
This is Rietveld 408576698