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

views/controls/menu/menu_controller.cc

Index: views/controls/menu/menu_controller.cc
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index e1b38aafa1a3c9256e4f763c74bbcc0332b9926a..6f6bc230d95e015c8ff3dbd4a2e0d5e795bac2dd 100644
--- a/views/controls/menu/menu_controller.cc
+++ b/views/controls/menu/menu_controller.cc
@@ -858,7 +858,16 @@ bool MenuController::Dispatch(const MSG& msg) {
   DispatchMessage(&msg);
   return exit_type_ == EXIT_NONE;
 }
+#elif defined(TOUCH_UI)
+base::MessagePumpDispatcher::DispatchStatus
+    MenuController::Dispatch(XEvent* xev) {
+  if (!DispatchXEvent(xev))
+    return EVENT_IGNORED;
 
+  return exit_type_ != EXIT_NONE ?
+      base::MessagePumpDispatcher::EVENT_QUIT :
+      base::MessagePumpDispatcher::EVENT_PROCESSED;
+}
 #else
 bool MenuController::Dispatch(GdkEvent* event) {
   if (exit_type_ == EXIT_ALL || exit_type_ == EXIT_DESTROYED) {
@@ -897,19 +906,6 @@ bool MenuController::Dispatch(GdkEvent* event) {
   gtk_main_do_event(event);
   return exit_type_ == EXIT_NONE;
 }
-
-#if defined(TOUCH_UI)
-base::MessagePumpGlibXDispatcher::DispatchStatus
-    MenuController::DispatchX(XEvent* xev) {
-  if (!DispatchXEvent(xev))
-    return EVENT_IGNORED;
-
-  return exit_type_ != EXIT_NONE ?
-      base::MessagePumpGlibXDispatcher::EVENT_QUIT :
-      base::MessagePumpGlibXDispatcher::EVENT_PROCESSED;
-}
-#endif
-
 #endif
 
 bool MenuController::OnKeyDown(int key_code