Move all event related devices from ui/events/ to ui/events/devices/

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 22 matching lines @@
         '../gfx/gfx.gyp:gfx_geometry',
         'dom4_keycode_converter',
       ],
       'defines': [
         'EVENTS_BASE_IMPLEMENTATION',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
         'android/scroller.cc',
         'android/scroller.h',
-        'device_data_manager.cc',
-        'device_data_manager.h',
-        'device_hotplug_event_observer.h',
-        'device_util_linux.cc',
-        'device_util_linux.h',
         'event_constants.h',
         'event_switches.cc',
         'event_switches.h',
         'events_base_export.h',
         'gesture_curve.h',
         'gesture_event_details.cc',
         'gesture_event_details.h',
         'gestures/fling_curve.cc',
         'gestures/fling_curve.h',
-        'input_device.cc',
-        'input_device.h',
-        'input_device_event_observer.h',
-        'keyboard_device.cc',
-        'keyboard_device.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',
         'keycodes/keyboard_codes.h',
         'latency_info.cc',
         'latency_info.h',
-        'touchscreen_device.cc',
-        'touchscreen_device.h',
-        'x/device_data_manager_x11.cc',
-        'x/device_data_manager_x11.h',
-        'x/device_list_cache_x.cc',
-        'x/device_list_cache_x.h',
-        'x/hotplug_event_handler_x11.cc',
-        'x/hotplug_event_handler_x11.h',
         'x/keysym_to_unicode.cc',
         'x/keysym_to_unicode.h',
-        'x/touch_factory_x11.cc',
-        'x/touch_factory_x11.h',
       ],
       'export_dependent_settings': [
         '../../ui/gfx/gfx.gyp:gfx',
       ],
       'conditions': [
         ['use_x11==1', {
           'dependencies': [
             '../../build/linux/system.gyp:x11',
             '../gfx/x/gfx_x11.gyp:gfx_x11',
           ],
@@ skipping 54 matching lines @@
         '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_x11==1', {
           'dependencies': [
+            'devices/events_devices.gyp:events_devices',

[sadrul, 2014/11/03 17:09:59]

Why just for use_x11?

[dnicoara, 2014/11/03 18:13:17]

x/events_x.cc is the only file pulling in the events_devices dependency.

             '../../build/linux/system.gyp:x11',
           ],
         }],
         ['use_aura==0', {
           'sources!': [
             'gestures/gesture_provider_aura.cc',
             'gestures/gesture_provider_aura.h',
             'gestures/gesture_recognizer.h',
             'gestures/gesture_recognizer_impl.cc',
             'gestures/gesture_recognizer_impl.h',
@@ skipping 116 matching lines @@
         'test/test_event_processor.cc',
         'test/test_event_processor.h',
         'test/test_event_target.cc',
         'test/test_event_target.h',
       ],
       'conditions': [
         ['OS=="ios"', {
           # The cocoa files don't apply to iOS.
           'sources/': [['exclude', 'cocoa']],
         }],
+        ['use_x11==1', {
+          'dependencies': [
+            'devices/events_devices.gyp:events_devices',
+          ],
+        }],
       ],
     },
     {
       # GN version: //ui/events:events_unittests
       'target_name': 'events_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:run_all_unittests',
         '<(DEPTH)/base/base.gyp:test_support_base',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '../gfx/gfx.gyp:gfx',
         '../gfx/gfx.gyp:gfx_geometry',
         '../gfx/gfx.gyp:gfx_test_support',
         'dom4_keycode_converter',
+        'devices/events_devices.gyp:events_devices',

[sadrul, 2014/11/03 17:09:59]

sort

[dnicoara, 2014/11/03 18:13:17]

Done.

         'events',
         'events_base',
         'events_test_support',
         'gesture_detection',
         'platform/events_platform.gyp:events_platform',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
         'android/scroller_unittest.cc',
         'cocoa/events_mac_unittest.mm',
+        'devices/x11/device_data_manager_x11_unittest.cc',
         'event_dispatcher_unittest.cc',
         'event_processor_unittest.cc',
         'event_rewriter_unittest.cc',
         'event_unittest.cc',
         'gesture_detection/bitset_32_unittest.cc',
         'gesture_detection/gesture_event_data_packet_unittest.cc',
         'gesture_detection/gesture_provider_unittest.cc',
         'gesture_detection/motion_event_buffer_unittest.cc',
         'gesture_detection/motion_event_generic_unittest.cc',
         'gesture_detection/snap_scroll_controller_unittest.cc',
         'gesture_detection/touch_disposition_gesture_filter_unittest.cc',
         'gesture_detection/velocity_tracker_unittest.cc',
         'gestures/fling_curve_unittest.cc',
         'gestures/gesture_provider_aura_unittest.cc',
         'gestures/motion_event_aura_unittest.cc',
         'keycodes/dom4/keycode_converter_unittest.cc',
         'latency_info_unittest.cc',
         'platform/platform_event_source_unittest.cc',
-        'x/device_data_manager_x11_unittest.cc',
         'x/events_x_unittest.cc',
       ],
       'conditions': [
         ['use_x11==1', {
           'dependencies': [
             '../../build/linux/system.gyp:x11',
             '../gfx/x/gfx_x11.gyp:gfx_x11',
           ],
         }],
         ['use_ozone==1', {
@@ skipping 43 matching lines @@
           ],
           'variables': {
             'test_suite_name': 'events_unittests',
           },
           'includes': [ '../../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }