Move more input-related files to renderer_host/input

content/content_browser.gypi

Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 4fc086177cc14ee446e4c590193b89e62c5f332a..0c40ddbec98dd4cb4dc824cb91437f552f9737b8 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -754,8 +754,6 @@
     'browser/renderer_host/file_utilities_message_filter.h',
     'browser/renderer_host/gamepad_browser_message_filter.cc',
     'browser/renderer_host/gamepad_browser_message_filter.h',
-    'browser/renderer_host/gesture_event_filter.cc',
-    'browser/renderer_host/gesture_event_filter.h',
     'browser/renderer_host/gpu_message_filter.cc',
     'browser/renderer_host/gpu_message_filter.h',
     'browser/renderer_host/gtk_im_context_wrapper.cc',
@@ -774,10 +772,23 @@
     'browser/renderer_host/image_transport_factory_android.h',
     'browser/renderer_host/ime_adapter_android.cc',
     'browser/renderer_host/ime_adapter_android.h',
+    'browser/renderer_host/input/gesture_event_filter.cc',
+    'browser/renderer_host/input/gesture_event_filter.h',
     'browser/renderer_host/input/immediate_input_router.cc',
     'browser/renderer_host/input/immediate_input_router.h',
     'browser/renderer_host/input/input_router.h',
     'browser/renderer_host/input/input_router_client.h',
+    'browser/renderer_host/input/tap_suppression_controller.cc',
+    'browser/renderer_host/input/tap_suppression_controller.h',
+    'browser/renderer_host/input/tap_suppression_controller_client.h',
+    'browser/renderer_host/input/touch_event_queue.cc',
+    'browser/renderer_host/input/touch_event_queue.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',
@@ -954,25 +965,14 @@
     'browser/renderer_host/software_output_device_x11.h',
     'browser/renderer_host/surface_texture_transport_client_android.cc',
     'browser/renderer_host/surface_texture_transport_client_android.h',
-    'browser/renderer_host/tap_suppression_controller.cc',
-    'browser/renderer_host/tap_suppression_controller.h',
-    'browser/renderer_host/tap_suppression_controller_client.h',
     'browser/renderer_host/text_input_client_mac.h',
     'browser/renderer_host/text_input_client_mac.mm',
     'browser/renderer_host/text_input_client_message_filter.h',
     'browser/renderer_host/text_input_client_message_filter.mm',
-    'browser/renderer_host/touch_event_queue.cc',
-    'browser/renderer_host/touch_event_queue.h',
     'browser/renderer_host/touch_smooth_scroll_gesture_android.cc',
     'browser/renderer_host/touch_smooth_scroll_gesture_android.h',
     'browser/renderer_host/touch_smooth_scroll_gesture_aura.cc',
     'browser/renderer_host/touch_smooth_scroll_gesture_aura.h',
-    'browser/renderer_host/touchpad_tap_suppression_controller_aura.cc',
-    'browser/renderer_host/touchpad_tap_suppression_controller.cc',
-    'browser/renderer_host/touchpad_tap_suppression_controller.h',
-    'browser/renderer_host/touchscreen_tap_suppression_controller.cc',
-    'browser/renderer_host/touchscreen_tap_suppression_controller.h',
-    'browser/renderer_host/touchscreen_tap_suppression_controller_stub.cc',
     'browser/renderer_host/ui_events_helper.cc',
     'browser/renderer_host/ui_events_helper.h',
     'browser/renderer_host/web_input_event_aura.cc',
@@ -1406,11 +1406,11 @@
         'browser/renderer_host/ui_events_helper.cc',
         'browser/renderer_host/ui_events_helper.h',
         'browser/renderer_host/tap_suppression_controller.cc',
-        'browser/renderer_host/touchscreen_tap_suppression_controller.cc',
+        'browser/renderer_host/input/touchscreen_tap_suppression_controller.cc',

[piman, 2013/07/25 17:10:38]

nit: can you keep these in alpha order (and others below)?

[jdduke (slow), 2013/07/25 17:48:59]

Done.

       ],
     }, {
       'sources!': [
-        'browser/renderer_host/touchscreen_tap_suppression_controller_stub.cc',
+        'browser/renderer_host/input/touchscreen_tap_suppression_controller_stub.cc',
       ],
     }],
     ['use_aura==1', {
@@ -1426,7 +1426,7 @@
         ['exclude', '^browser/renderer_host/render_widget_host.h'],
         ['exclude', '^browser/renderer_host/render_widget_host_view_win.cc'],
         ['exclude', '^browser/renderer_host/render_widget_host_view_win.h'],
-        ['exclude', '^browser/renderer_host/touchpad_tap_suppression_controller.cc'],
+        ['exclude', '^browser/renderer_host/input/touchpad_tap_suppression_controller.cc'],
         ['exclude', '^browser/web_contents/web_contents_drag_win.cc'],
         ['exclude', '^browser/web_contents/web_contents_drag_win.h'],
         ['exclude', '^browser/web_contents/web_contents_view_win.cc'],
@@ -1448,7 +1448,7 @@
         ['exclude', '^browser/renderer_host/software_output_device_win.h'],
         ['exclude', '^browser/renderer_host/software_output_device_x11.cc'],
         ['exclude', '^browser/renderer_host/software_output_device_x11.h'],
-        ['exclude', '^browser/renderer_host/touchpad_tap_suppression_controller_aura.cc'],
+        ['exclude', '^browser/renderer_host/input/touchpad_tap_suppression_controller_aura.cc'],
         ['exclude', '^browser/web_contents/touch_editable_impl_aura.cc'],
         ['exclude', '^browser/web_contents/touch_editable_impl_aura.h'],
       ],