[Tracking Patch] Unified gesture detection

ui/events/events.gyp

Index: ui/events/events.gyp
diff --git a/ui/events/events.gyp b/ui/events/events.gyp
index 88876574d09965569ecf783ff92929d7dce02ecf..f4ba0d4a166bf4850f564789ad94252730a6a3a3 100644
--- a/ui/events/events.gyp
+++ b/ui/events/events.gyp
@@ -61,7 +61,7 @@
           'dependencies': [
             '<(DEPTH)/build/linux/system.gyp:x11',
           ],
-        }],
+        }]
       ],
     },
     {
@@ -164,6 +164,43 @@
       ],
     },
     {
+      'target_name': 'gesture_detection',
+      'type': '<(component)',
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../gfx/gfx.gyp:gfx',
+        '../gfx/gfx.gyp:gfx_geometry',
+        'events_base',
+      ],
+      'defines': [
+        'GESTURE_DETECTION_IMPLEMENTATION',
+      ],
+      'sources': [
+        'gesture_detection/bitset_32.h',
+        'gesture_detection/gesture_detection_export.h',
+        'gesture_detection/gesture_detector.cc',
+        'gesture_detection/gesture_detector.h',
+        'gesture_detection/gesture_event_params.cc',
+        'gesture_detection/gesture_event_params.h',
+        'gesture_detection/gesture_config_helper_aura.cc',
+        'gesture_detection/gesture_config_helper_android.cc',
+        'gesture_detection/gesture_config_helper.h',
+        '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/velocity_tracker_state.cc',
+        'gesture_detection/velocity_tracker_state.h',
+        'gesture_detection/velocity_tracker.cc',
+        'gesture_detection/velocity_tracker.h',
+      ],
+      'conditions': [],
+    },
+    {
       'target_name': 'events_test_support',
       'type': 'static_library',
       'dependencies': [
@@ -208,12 +245,17 @@
         'events',
         'events_base',
         'events_test_support',
+        'gesture_detection'
       ],
       'sources': [
         'event_dispatcher_unittest.cc',
         'event_processor_unittest.cc',
         'event_unittest.cc',
         'gestures/velocity_calculator_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',
         'keycodes/dom4/keycode_converter_unittest.cc',
         'latency_info_unittest.cc',
         'ozone/evdev/key_event_converter_evdev_unittest.cc',
@@ -226,7 +268,33 @@
             '<(DEPTH)/base/allocator/allocator.gyp:allocator',
           ],
         }],
+        ['OS == "android" and gtest_target_type == "shared_library"', {
+          'dependencies': [
+            '../../testing/android/native_test.gyp:native_test_native_code',
+          ],
+        }],
       ],
     },
   ],
+  'conditions': [
+    # Special target to wrap a gtest_target_type==shared_library
+    # ui_unittests into an android apk for execution.
+    # See base.gyp for TODO(jrg)s about this strategy.
+    ['OS == "android" and gtest_target_type == "shared_library"', {
+      'targets': [
+        {
+          'target_name': 'events_unittests_apk',
+          'type': 'none',
+          'dependencies': [
+            'events_unittests',
+          ],
+          'variables': {
+            'test_suite_name': 'events_unittests',
+            'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)events_unittests<(SHARED_LIB_SUFFIX)',
+          },
+          'includes': [ '../../build/apk_test.gypi' ],
+        },
+      ],
+    }],
+  ],
 }