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

Unified Diff: content/content_browser.gypi

Issue 260923003: Revert of Consolidate all touch/gesture related constants in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 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: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index ec8399a06ef4fd1d70aa95486814c72324f79ba9..f6e67b705c1e5f64dc116fca37ef1c916fd2dc69 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -905,8 +905,6 @@
'browser/renderer_host/input/input_router_client.h',
'browser/renderer_host/input/input_router_impl.cc',
'browser/renderer_host/input/input_router_impl.h',
- 'browser/renderer_host/input/input_router_config_helper.cc',
- 'browser/renderer_host/input/input_router_config_helper.h',
'browser/renderer_host/input/motion_event_android.cc',
'browser/renderer_host/input/motion_event_android.h',
'browser/renderer_host/input/motion_event_web.cc',
@@ -940,10 +938,12 @@
'browser/renderer_host/input/touch_event_queue.h',
'browser/renderer_host/input/touch_action_filter.cc',
'browser/renderer_host/input/touch_action_filter.h',
+ 'browser/renderer_host/input/touchpad_tap_suppression_controller_aura.cc',
'browser/renderer_host/input/touchpad_tap_suppression_controller.cc',
'browser/renderer_host/input/touchpad_tap_suppression_controller.h',
'browser/renderer_host/input/touchscreen_tap_suppression_controller.cc',
'browser/renderer_host/input/touchscreen_tap_suppression_controller.h',
+ 'browser/renderer_host/input/touchscreen_tap_suppression_controller_stub.cc',
'browser/renderer_host/input/web_input_event_builders_android.cc',
'browser/renderer_host/input/web_input_event_builders_android.h',
'browser/renderer_host/input/web_input_event_builders_win.cc',
@@ -1649,13 +1649,27 @@
['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$'],
],
}],
+ ['use_aura!=1 and OS!="android"', {
+ 'sources!': [
+ 'browser/renderer_host/input/touchscreen_tap_suppression_controller.cc',
+ 'browser/renderer_host/tap_suppression_controller.cc',
+ ],
+ }, {
+ 'sources!': [
+ 'browser/renderer_host/input/touchscreen_tap_suppression_controller_stub.cc',
+ ],
+ }],
['use_aura==1', {
'dependencies': [
'../ui/aura/aura.gyp:aura',
'../ui/base/strings/ui_strings.gyp:ui_strings',
],
+ 'sources/': [
+ ['exclude', '^browser/renderer_host/input/touchpad_tap_suppression_controller.cc'],
+ ],
}, {
'sources/': [
+ ['exclude', '^browser/renderer_host/input/touchpad_tap_suppression_controller_aura.cc'],
['exclude', '^browser/renderer_host/render_widget_host_view_aura.cc'],
['exclude', '^browser/renderer_host/render_widget_host_view_aura.h'],
['exclude', '^browser/web_contents/touch_editable_impl_aura.cc'],
« no previous file with comments | « content/browser/renderer_host/render_widget_host_unittest.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698