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

views/focus/accelerator_handler_touch.cc

Index: views/focus/accelerator_handler_touch.cc
diff --git a/views/focus/accelerator_handler_touch.cc b/views/focus/accelerator_handler_touch.cc
index 3ffbd6a3ca7994e4afe154b0fc3bb16064b203f7..f5ccd316462579872726b7747e5e3969c19ce59a 100644
--- a/views/focus/accelerator_handler_touch.cc
+++ b/views/focus/accelerator_handler_touch.cc
@@ -177,16 +177,18 @@ void SetTouchDeviceList(std::vector<unsigned int>& devices) {
 
 AcceleratorHandler::AcceleratorHandler() {}
 
+#if defined(TOUCH_UI)
+base::MessagePumpDispatcher::DispatchStatus
+    AcceleratorHandler::Dispatch(XEvent* xev) {
+  return DispatchXEvent(xev) ?
+      base::MessagePumpDispatcher::EVENT_PROCESSED :
+      base::MessagePumpDispatcher::EVENT_IGNORED;
+}
+#else
 bool AcceleratorHandler::Dispatch(GdkEvent* event) {
   gtk_main_do_event(event);
   return true;
 }
-
-base::MessagePumpGlibXDispatcher::DispatchStatus
-    AcceleratorHandler::DispatchX(XEvent* xev) {
-  return DispatchXEvent(xev) ?
-      base::MessagePumpGlibXDispatcher::EVENT_PROCESSED :
-      base::MessagePumpGlibXDispatcher::EVENT_IGNORED;
-}
+#endif
 
 }  // namespace views