Revert of Unified Gesture Recognizer

ui/events/events.gyp

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 21 matching lines @@
       'defines': [
         'EVENTS_BASE_IMPLEMENTATION',
       ],
       'sources': [
         'event_constants.h',
         'event_switches.cc',
         'event_switches.h',
         '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',
         'keycodes/keyboard_code_conversion_android.h',
         'keycodes/keyboard_code_conversion_mac.h',
         'keycodes/keyboard_code_conversion_mac.mm',
         'keycodes/keyboard_code_conversion_win.cc',
         'keycodes/keyboard_code_conversion_win.h',
         'keycodes/keyboard_code_conversion_x.cc',
         'keycodes/keyboard_code_conversion_x.h',
@@ skipping 19 matching lines @@
     {
       'target_name': 'events',
       'type': '<(component)',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '<(DEPTH)/skia/skia.gyp:skia',
         '../gfx/gfx.gyp:gfx',
         '../gfx/gfx.gyp:gfx_geometry',
         'events_base',
-        'gesture_detection',
       ],
       'defines': [
         'EVENTS_IMPLEMENTATION',
       ],
       'sources': [
         'cocoa/cocoa_event_utils.h',
         'cocoa/cocoa_event_utils.mm',
         'cocoa/events_mac.mm',
         'event.cc',
         'event.h',
         'event_dispatcher.cc',
         'event_dispatcher.h',
         'event_handler.cc',
         'event_handler.h',
         'event_processor.cc',
         'event_processor.h',
         'event_rewriter.h',
         'event_source.cc',
         'event_source.h',
         'event_target.cc',
         'event_target.h',
         'event_target_iterator.h',
         'event_targeter.cc',
         'event_targeter.h',
         'event_utils.cc',
         'event_utils.h',
         'events_export.h',
         'events_stub.cc',
+        'gestures/gesture_configuration.cc',
+        'gestures/gesture_configuration.h',
         'gestures/gesture_point.cc',
         'gestures/gesture_point.h',
-        'gestures/gesture_provider_aura.cc',
-        'gestures/gesture_provider_aura.h',
         'gestures/gesture_recognizer.h',
         'gestures/gesture_recognizer_impl.cc',
         'gestures/gesture_recognizer_impl.h',
         'gestures/gesture_sequence.cc',
         'gestures/gesture_sequence.h',
         'gestures/gesture_types.h',
-        'gestures/motion_event_aura.cc',
-        'gestures/motion_event_aura.h',
         'gestures/velocity_calculator.cc',
         'gestures/velocity_calculator.h',
         'ozone/device/device_event.cc',
         'ozone/device/device_event.h',
         'ozone/device/device_event_observer.h',
         'ozone/device/device_manager.cc',
         'ozone/device/device_manager.h',
         'ozone/device/device_manager_manual.cc',
         'ozone/device/device_manager_manual.h',
         'ozone/device/udev/device_manager_udev.cc',
@@ skipping 35 matching lines @@
         'platform/x11/x11_event_source_glib.cc',
         'platform/x11/x11_event_source_libevent.cc',
         'win/events_win.cc',
         'x/events_x.cc',
         'linux/text_edit_command_auralinux.cc',
         'linux/text_edit_command_auralinux.h',
         'linux/text_edit_key_bindings_delegate_auralinux.cc',
         'linux/text_edit_key_bindings_delegate_auralinux.h',
       ],
       'conditions': [
-        ['use_aura==0', {
-          'sources!': [
-            'gestures/gesture_point.cc',
-            'gestures/gesture_point.h',
-            'gestures/gesture_provider_aura.cc',
-            'gestures/gesture_provider_aura.h',
-            'gestures/gesture_recognizer.h',
-            'gestures/gesture_recognizer_impl.cc',
-            'gestures/gesture_recognizer_impl.h',
-            'gestures/gesture_sequence.cc',
-            'gestures/gesture_sequence.h',
-            'gestures/gesture_types.h',
-            'gestures/motion_event_aura.cc',
-            'gestures/motion_event_aura.h',
-            'gestures/velocity_calculator.cc',
-            'gestures/velocity_calculator.h',
-          ],
-        }],
         # We explicitly enumerate the platforms we _do_ provide native cracking
         # for here.
         ['OS=="win" or OS=="mac" or use_x11==1 or use_ozone==1', {
           'sources!': [
             'events_stub.cc',
           ],
         }],
         ['chromeos==1', {
           'sources!': [
             'linux/text_edit_command_auralinux.cc',
@@ skipping 62 matching lines @@
         '../gfx/gfx.gyp:gfx_geometry',
         'events_base',
       ],
       'defines': [
         'GESTURE_DETECTION_IMPLEMENTATION',
       ],
       'sources': [
         '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',
         'gesture_detection/gesture_event_data.cc',
         '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',
         'gesture_detection/scale_gesture_detector.cc',
         'gesture_detection/scale_gesture_detector.h',
         'gesture_detection/snap_scroll_controller.cc',
         'gesture_detection/snap_scroll_controller.h',
         'gesture_detection/touch_disposition_gesture_filter.cc',
         'gesture_detection/touch_disposition_gesture_filter.h',
         'gesture_detection/velocity_tracker_state.cc',
         'gesture_detection/velocity_tracker_state.h',
         'gesture_detection/velocity_tracker.cc',
         'gesture_detection/velocity_tracker.h',
       ],
       'conditions': [
+        ['use_aura==1', {
+          'dependencies': [
+            'events'
+          ],
+        }],
         ['use_aura!=1 and OS!="android"', {
           'sources': [
             'gesture_detection/gesture_config_helper.cc',
           ],
         }],
       ],
     },
     {
       'target_name': 'events_test_support',
       'type': 'static_library',
@@ skipping 37 matching lines @@
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:run_all_unittests',
         '<(DEPTH)/base/base.gyp:test_support_base',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '../gfx/gfx.gyp:gfx_geometry',
         '../gfx/gfx.gyp:gfx_test_support',
         'dom4_keycode_converter',
         'events',
         'events_base',
         'events_test_support',
-        'gesture_detection',
+        'gesture_detection'
       ],
       'sources': [
         'cocoa/events_mac_unittest.mm',
         'event_dispatcher_unittest.cc',
         'event_processor_unittest.cc',
         'event_rewriter_unittest.cc',
         'event_unittest.cc',
-        'gestures/motion_event_aura_unittest.cc',
         '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/touch_disposition_gesture_filter_unittest.cc',
         'keycodes/dom4/keycode_converter_unittest.cc',
         'latency_info_unittest.cc',
         'ozone/evdev/key_event_converter_evdev_unittest.cc',
         'ozone/evdev/touch_event_converter_evdev_unittest.cc',
         'platform/platform_event_source_unittest.cc',
         'x/events_x_unittest.cc',
       ],
       'conditions': [
-        ['use_aura==0', {
-          'sources!': [
-            'gestures/motion_event_aura_unittest.cc',
-            'gestures/velocity_calculator_unittest.cc',
-          ],
-        }],
         ['OS=="linux" and use_allocator!="none"', {
           'dependencies': [
             '<(DEPTH)/base/allocator/allocator.gyp:allocator',
           ],
         }],
         # Exclude tests that rely on event_utils.h for platforms that do not
         # provide native cracking, i.e., platforms that use events_stub.cc.
         ['OS!="win" and use_x11!=1 and use_ozone!=1', {
           'sources!': [
             'event_unittest.cc',
@@ skipping 21 matching lines @@
           ],
           'variables': {
             'test_suite_name': 'events_unittests',
           },
           'includes': [ '../../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }