Refactor the glib message-pump, and use it as the base for a gtk message pump and an X message pump.

base/base.gypi

 # 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.
 
 {
   'target_defaults': {
     'variables': {
       'base_target': 0,
     },
     'target_conditions': [
@@ skipping 350 matching lines @@
           '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks',
         ],
         'conditions': [
           [ 'toolkit_uses_gtk==0', {
               'sources/': [
                 ['exclude', '^nix/'],
               ],
               'sources!': [
                 'atomicops_internals_x86_gcc.cc',
                 'message_pump_glib.cc',
-                'message_pump_glib_x.cc',
+                'message_pump_gtk.cc',
+                'message_pump_x.cc',
               ],
           }],
+          [ 'touchui==0', {
+            'sources!' : [ 'message_pump_x.cc', ],
+          }, {
+            'sources!' : [ 'message_pump_gtk.cc', ],
+          }],
           [ 'OS != "linux"', {
               'sources!': [
                 # Not automatically excluded by the *linux.cc rules.
                 'gtk_util.cc',
                 'gtk_util.h',
                 'linux_util.cc',
               ],
             },
           ],
           [ 'OS != "mac"', {
@@ skipping 180 matching lines @@
         'event_recorder.h',
         'event_recorder_stubs.cc',
         'file_descriptor_shuffle.cc',
         'file_descriptor_shuffle.h',
         'linux_util.cc',
         'linux_util.h',
         'md5.cc',
         'md5.h',
         'message_pump_glib.cc',
         'message_pump_glib.h',
-        'message_pump_glib_x.cc',
-        'message_pump_glib_x.h',
-        'message_pump_glib_x_dispatch.h',
+        'message_pump_gtk.cc',
+        'message_pump_gtk.h',
+        'message_pump_x.cc',
+        'message_pump_x.h',
         'message_pump_libevent.cc',
         'message_pump_libevent.h',
         'message_pump_mac.h',
         'message_pump_mac.mm',
         'metrics/field_trial.cc',
         'metrics/field_trial.h',
         'string16.cc',
         'string16.h',
         'sync_socket.h',
         'sync_socket_win.cc',
@@ skipping 89 matching lines @@
             'third_party/xdg_mime/xdgmimemagic.c',
             'third_party/xdg_mime/xdgmimemagic.h',
             'third_party/xdg_mime/xdgmimeparent.c',
             'third_party/xdg_mime/xdgmimeparent.h',
           ],
         },
       ],
     }],
   ],
 }