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.h

Index: views/controls/menu/menu_controller.h
diff --git a/views/controls/menu/menu_controller.h b/views/controls/menu/menu_controller.h
index cc898087a56130b40e4eb2d7e9fed6e59a31a937..7721a6e16f141d94a6f54b30cc96c7217a914a9b 100644
--- a/views/controls/menu/menu_controller.h
+++ b/views/controls/menu/menu_controller.h
@@ -207,15 +207,12 @@ class MenuController : public MessageLoopForUI::Dispatcher {
   // Dispatcher method. This returns true if the menu was canceled, or
   // if the message is such that the menu should be closed.
   virtual bool Dispatch(const MSG& msg);
-
+#elif defined(TOUCH_UI)
+  virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(XEvent* xevent);
 #else
   virtual bool Dispatch(GdkEvent* event);
 #endif
 
-#if defined(TOUCH_UI)
-  virtual MessagePumpGlibXDispatcher::DispatchStatus DispatchX(XEvent* xevent);
-#endif
-
   // Key processing. The return value of this is returned from Dispatch.
   // In other words, if this returns false (which happens if escape was
   // pressed, or a matching mnemonic was found) the message loop returns.