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

Unified Diff: ui/events/events.gyp

Issue 613373004: Adopt ui::GestureConfiguration on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 2 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/events/events.gyp
diff --git a/ui/events/events.gyp b/ui/events/events.gyp
index c4a0d3f7f9a3489650b37fbf7630a212caa6a72c..d8f8b27c40645baae3b6a6ea973a1d0fa7cef9da 100644
--- a/ui/events/events.gyp
+++ b/ui/events/events.gyp
@@ -52,8 +52,6 @@
'gesture_event_details.h',
'gestures/fling_curve.cc',
'gestures/fling_curve.h',
- 'gestures/gesture_configuration.cc',
- 'gestures/gesture_configuration.h',
'input_device.cc',
'input_device.h',
'keyboard_device.cc',
@@ -208,9 +206,10 @@
'gesture_detection/bitset_32.h',
'gesture_detection/filtered_gesture_provider.cc',
'gesture_detection/filtered_gesture_provider.h',
- 'gesture_detection/gesture_config_helper.h',
- 'gesture_detection/gesture_config_helper_android.cc',
- 'gesture_detection/gesture_config_helper_aura.cc',
+ 'gesture_detection/gesture_configuration.cc',
+ 'gesture_detection/gesture_configuration.h',
+ 'gesture_detection/gesture_configuration_android.cc',
+ 'gesture_detection/gesture_configuration_aura.cc',
'gesture_detection/gesture_detection_export.h',
'gesture_detection/gesture_detector.cc',
'gesture_detection/gesture_detector.h',
@@ -246,7 +245,7 @@
'conditions': [
['use_aura!=1 and OS!="android"', {
'sources': [
- 'gesture_detection/gesture_config_helper.cc',
+ 'gesture_detection/gesture_configuration_default.cc',
],
}],
],

Powered by Google App Engine
This is Rietveld 408576698