Consolidate/cleanup event cracking code; single out GdkEvents.

ui/ui.gyp

 # Copyright (c) 2011 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,
     'toolkit_views2': 0,  # ui/views/ is an experimental framework on Windows.
   },
   'target_defaults': {
     'conditions': [
       ['OS=="win"',
         {'variables': {'toolkit_views2': 1}},
       ],
       ['toolkit_views2==0', {'sources/': [
         ['exclude', 'views/'],
       ]}],
       ['touchui==0', {'sources/': [
-        ['exclude', 'event_x.cc$'],
-        ['exclude', 'native_menu_x.cc$'],
-        ['exclude', 'native_menu_x.h$'],
-        ['exclude', 'touchui/'],
         ['exclude', '_(touch)\\.cc$'],
       ]}],
     ],
   },
   'includes': [
     'ui_resources.gypi',
   ],
   'targets': [
     {
       'target_name': 'ui',
@@ skipping 149 matching lines @@
         'base/resource/resource_bundle_linux.cc',
         'base/resource/resource_bundle_mac.mm',
         'base/resource/resource_bundle_posix.cc',
         'base/resource/resource_bundle_win.cc',
         'base/text/bytes_formatting.cc',
         'base/text/bytes_formatting.h',
         'base/text/text_elider.cc',
         'base/text/text_elider.h',
         'base/theme_provider.cc',
         'base/theme_provider.h',
+        'base/touch/touch_factory.cc',
+        'base/touch/touch_factory.h',
         'base/ui_base_exports.cc',
         'base/ui_base_paths.cc',
         'base/ui_base_paths.h',
         'base/ui_base_switches.cc',
         'base/ui_base_switches.h',
         'base/ui_base_types.h',
         'base/ui_export.h',
         'base/view_prop.cc',
         'base/view_prop.h',
+        'base/wayland/events_wayland.cc',
+        'base/win/events_win.cc',
         'base/win/hwnd_util.cc',
         'base/win/hwnd_util.h',
         'base/win/ime_input.cc',
         'base/win/ime_input.h',
         'base/win/mouse_wheel_util.cc',
         'base/win/mouse_wheel_util.h',
         'base/win/shell.cc',
         'base/win/shell.h',
         'base/win/window_impl.cc',
         'base/win/window_impl.h',
         'base/x/active_window_watcher_x.cc',
         'base/x/active_window_watcher_x.h',
+        'base/x/events_x.cc',
         'base/x/x11_util.cc',
         'base/x/x11_util.h',
         'base/x/x11_util_internal.h',
         'gfx/blit.cc',
         'gfx/blit.h',
         'gfx/brush.h',
         'gfx/canvas.cc',
         'gfx/canvas.h',
         'gfx/canvas_skia.h',
         'gfx/canvas_skia.cc',
@@ skipping 178 matching lines @@
             'gfx/gdi_util.h',
             'gfx/icon_util.cc',
             'gfx/icon_util.h',
             'gfx/native_theme_win.cc',
             'gfx/native_theme_win.h',
             'gfx/win_util.cc',
             'gfx/win_util.h',
           ],
           'sources!': [
             'base/clipboard/clipboard_aura.cc',
+            'base/touch/touch_factory.cc',
+            'base/touch/touch_factory.h',
             'gfx/pango_util.h',
             'gfx/pango_util.cc',
             'gfx/platform_font_pango.cc',
             'gfx/platform_font_pango.h',
           ],
           'include_dirs': [
             '../',
             '../third_party/wtl/include',
           ],
           'msvs_settings': {
@@ skipping 25 matching lines @@
             'base/dragdrop/os_exchange_data.cc',
             'base/view_prop.cc',
             'base/view_prop.h',
           ],
           'sources/': [
             ['exclude', '^base/win/*'],
           ],
         }],
         ['OS=="mac"', {
           'sources!': [
+            'base/touch/touch_factory.cc',
+            'base/touch/touch_factory.h',
             'gfx/pango_util.h',
             'gfx/pango_util.cc',
             'gfx/platform_font_pango.h',
             'gfx/platform_font_pango.cc',
           ],
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
               '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
             ],
           },
         }],
         ['use_x11==1', {
           'all_dependent_settings': {
             'ldflags': [
               '-L<(PRODUCT_DIR)',
             ],
             'link_settings': {
               'libraries': [
                 '-lX11',
                 '-ldl',
               ],
             },
           },
         }, {  # use_x11==0
           'sources!': [
             'base/keycodes/keyboard_code_conversion_x.cc',
             'base/keycodes/keyboard_code_conversion_x.h',
+            'base/x/active_window_watcher_x.cc',
+            'base/x/active_window_watcher_x.h',
+            'base/x/events_x.cc',
+            'base/x/x11_util.cc',
+            'base/x/x11_util.h',
+            'base/x/x11_util_internal.h',
           ],
         }],
         ['chromeos==1', {
           'sources': [
             'gfx/native_theme_chromeos.cc',
             'gfx/native_theme_chromeos.h',
           ],
         }],
         ['toolkit_views==0', {
           'sources!': [
@@ skipping 68 matching lines @@
                 'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \
                 'os.chmod(\'<(ui_copy_dest)\', 0700)'
               ]
             }
           ],
         },
       ],
     }],
   ],
 }