Consolidate/cleanup event cracking code; single out GdkEvents.

ui/ui.gyp

Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 15dcf6895cff827e27097b4b9cf968d4ddcc27ad..0224e3e8b9d7ab101fe69e33e23582a2d29cef51 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -16,10 +16,6 @@
         ['exclude', 'views/'],
       ]}],
       ['touchui==0', {'sources/': [
-        ['exclude', 'event_x.cc$'],
-        ['exclude', 'native_menu_x.cc$'],
-        ['exclude', 'native_menu_x.h$'],
-        ['exclude', 'touchui/'],
         ['exclude', '_(touch)\\.cc$'],
       ]}],
     ],
@@ -107,6 +103,7 @@
         'base/events.h',
         'base/gtk/event_synthesis_gtk.cc',
         'base/gtk/event_synthesis_gtk.h',
+        'base/gtk/events_gtk.cc',
         'base/gtk/g_object_destructor_filo.cc',
         'base/gtk/g_object_destructor_filo.h',
         'base/gtk/gtk_expanded_container.cc',
@@ -188,6 +185,8 @@
         'base/text/text_elider.h',
         'base/theme_provider.cc',
         'base/theme_provider.h',
+        'base/touchui/touch_factory.cc',
+        'base/touchui/touch_factory.h',
         'base/ui_base_exports.cc',
         'base/ui_base_paths.cc',
         'base/ui_base_paths.h',
@@ -197,6 +196,8 @@
         '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',
@@ -209,6 +210,7 @@
         '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',
@@ -400,6 +402,8 @@
           ],
           'sources!': [
             'base/clipboard/clipboard_aura.cc',
+            'base/touchui/touch_factory.cc',
+            'base/touchui/touch_factory.h',
             'gfx/pango_util.h',
             'gfx/pango_util.cc',
             'gfx/platform_font_pango.cc',
@@ -445,6 +449,8 @@
         }],
         ['OS=="mac"', {
           'sources!': [
+            'base/touchui/touch_factory.cc',
+            'base/touchui/touch_factory.h',
             'gfx/pango_util.h',
             'gfx/pango_util.cc',
             'gfx/platform_font_pango.h',
@@ -473,6 +479,12 @@
           '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', {