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

 // 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.
 
 #ifndef VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 #define VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 #pragma once
 
 #include "build/build_config.h"
 
@@ skipping 189 matching lines @@
   // to show/hide submenus and update state_.
   void SetSelection(MenuItemView* menu_item, int types);
 
   // Sets the active MenuController.
   static void SetActiveInstance(MenuController* controller);
 
 #if defined(OS_WIN)
   // 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.
 #if defined(OS_WIN)
   bool OnKeyDown(int key_code, const MSG& msg);
 #else
   bool OnKeyDown(int key_code);
 #endif
 
   // Creates a MenuController. If blocking is true, Run blocks the caller
@@ skipping 258 matching lines @@
   // If non-null mouse drag events are forwarded to this view. See
   // UpdateActiveMouseView for details.
   View* active_mouse_view_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuController);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_