diff options
| author | lanwei <lanwei@chromium.org> | 2014-10-27 10:58:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-27 17:58:59 +0000 |
| commit | db8214afd49f75000a2bad0f16e0756bfcf54315 (patch) | |
| tree | cd83a6a67df51ac9b35c5b699b309d3e1ac5d7f5 /ui/events/BUILD.gn | |
| parent | e0420359b53ecc20f1475bf64eb7c96d05ed9c23 (diff) | |
| download | chromium_src-db8214afd49f75000a2bad0f16e0756bfcf54315.zip chromium_src-db8214afd49f75000a2bad0f16e0756bfcf54315.tar.gz chromium_src-db8214afd49f75000a2bad0f16e0756bfcf54315.tar.bz2 | |
Adopt ui::GestureConfiguration on Android
Making GestureConfiguration as an interface to serve all the platforms,
so that Aura and Android push to and pull from the same data source,
GestureConfiguration, where gesture configuring parameters are.
BUG=339203
Review URL: https://codereview.chromium.org/613373004
Cr-Commit-Position: refs/heads/master@{#301393}
Diffstat (limited to 'ui/events/BUILD.gn')
| -rw-r--r-- | ui/events/BUILD.gn | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn index c00d2e6..0233393 100644 --- a/ui/events/BUILD.gn +++ b/ui/events/BUILD.gn @@ -30,8 +30,6 @@ component("events_base") { "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", @@ -178,7 +176,8 @@ component("gesture_detection") { "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_configuration.cc", + "gesture_detection/gesture_configuration.h", "gesture_detection/gesture_detection_export.h", "gesture_detection/gesture_detector.cc", "gesture_detection/gesture_detector.h", @@ -190,6 +189,8 @@ component("gesture_detection") { "gesture_detection/gesture_listeners.h", "gesture_detection/gesture_provider.cc", "gesture_detection/gesture_provider.h", + "gesture_detection/gesture_provider_config_helper.cc", + "gesture_detection/gesture_provider_config_helper.h", "gesture_detection/gesture_touch_uma_histogram.cc", "gesture_detection/gesture_touch_uma_histogram.h", "gesture_detection/motion_event.cc", @@ -215,6 +216,7 @@ component("gesture_detection") { deps = [ ":events_base", "//base", + "//base/third_party/dynamic_annotations", "//ui/gfx", "//ui/gfx/geometry", ] @@ -222,11 +224,11 @@ component("gesture_detection") { defines = [ "GESTURE_DETECTION_IMPLEMENTATION" ] if (is_android) { - sources += [ "gesture_detection/gesture_config_helper_android.cc" ] + sources += [ "gesture_detection/gesture_configuration_android.cc" ] } else if (use_aura) { - sources += [ "gesture_detection/gesture_config_helper_aura.cc" ] + sources += [ "gesture_detection/gesture_configuration_aura.cc" ] } else { - sources += [ "gesture_detection/gesture_config_helper.cc" ] + sources += [ "gesture_detection/gesture_configuration_default.cc" ] } } |