Unified Gesture Recognizer

ui/events/events.gyp

Index: ui/events/events.gyp
diff --git a/ui/events/events.gyp b/ui/events/events.gyp
index fed04fb1b81e3dd85bdc03653059c9880df195e7..63f8a08a7ee326d527f135556530f3dede1ac77e 100644
--- a/ui/events/events.gyp
+++ b/ui/events/events.gyp
@@ -39,6 +39,8 @@
         'events_base_export.h',
         'gesture_event_details.cc',
         'gesture_event_details.h',
+        'gestures/gesture_configuration.cc',
+        'gestures/gesture_configuration.h',
         'keycodes/keyboard_code_conversion.cc',
         'keycodes/keyboard_code_conversion.h',
         'keycodes/keyboard_code_conversion_android.cc',
@@ -78,6 +80,7 @@
         '../gfx/gfx.gyp:gfx',
         '../gfx/gfx.gyp:gfx_geometry',
         'events_base',
+        'gesture_detection',
       ],
       'defines': [
         'EVENTS_IMPLEMENTATION',
@@ -106,8 +109,10 @@
         'event_utils.h',
         'events_export.h',
         'events_stub.cc',
-        'gestures/gesture_configuration.cc',
-        'gestures/gesture_configuration.h',
+        'gesture_detection/motion_event_ui.cc',
+        'gesture_detection/motion_event_ui.h',
+        'gesture_detection/ui_gesture_provider.cc',
+        'gesture_detection/ui_gesture_provider.h',
         'gestures/gesture_point.cc',
         'gestures/gesture_point.h',
         'gestures/gesture_recognizer.h',
@@ -253,6 +258,9 @@
         '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_detection_export.h',
         'gesture_detection/gesture_detector.cc',
         'gesture_detection/gesture_detector.h',
@@ -260,9 +268,6 @@
         'gesture_detection/gesture_event_data.h',
         'gesture_detection/gesture_event_data_packet.cc',
         'gesture_detection/gesture_event_data_packet.h',
-        'gesture_detection/gesture_config_helper.h',
-        'gesture_detection/gesture_config_helper_aura.cc',
-        'gesture_detection/gesture_config_helper_android.cc',
         'gesture_detection/gesture_provider.cc',
         'gesture_detection/gesture_provider.h',
         'gesture_detection/motion_event.h',
@@ -278,11 +283,6 @@
         'gesture_detection/velocity_tracker.h',
       ],
       'conditions': [
-        ['use_aura==1', {
-          'dependencies': [
-            'events'
-          ],
-        }],
         ['use_aura!=1 and OS!="android"', {
           'sources': [
             'gesture_detection/gesture_config_helper.cc',
@@ -351,10 +351,11 @@
         'gestures/velocity_calculator_unittest.cc',
         'gesture_detection/bitset_32_unittest.cc',
         'gesture_detection/gesture_provider_unittest.cc',
-        'gesture_detection/mock_motion_event.h',
         'gesture_detection/mock_motion_event.cc',
-        'gesture_detection/velocity_tracker_unittest.cc',
+        'gesture_detection/mock_motion_event.h',
+        'gesture_detection/motion_event_ui_unittest.cc',
         'gesture_detection/touch_disposition_gesture_filter_unittest.cc',
+        'gesture_detection/velocity_tracker_unittest.cc',
         'keycodes/dom4/keycode_converter_unittest.cc',
         'latency_info_unittest.cc',
         'ozone/evdev/key_event_converter_evdev_unittest.cc',