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

views/controls/menu/nested_dispatcher_gtk.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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_NESTED_DISPATCHER_GTK_H_
 #define VIEWS_CONTROLS_MENU_NESTED_DISPATCHER_GTK_H_
 #pragma once
 
 #include "base/message_loop.h"
 
 #if defined(TOUCH_UI)
@@ skipping 18 matching lines @@
   // deleted in the nested loop. Returns true if the menu is
   // deleted, or false otherwise.
   bool RunAndSelfDestruct();
 
   // Tells the nested dispatcher that creator has been destroyed.
   void CreatorDestroyed();
 
  private:
   virtual ~NestedDispatcherGtk() {}
 
+#if defined(TOUCH_UI)
+  virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(XEvent* xevent);
+#else
   // Overriden from MessageLoopForUI::Dispatcher:
   virtual bool Dispatch(GdkEvent* event);
-
-#if defined(TOUCH_UI)
-  virtual base::MessagePumpGlibXDispatcher::DispatchStatus
-      DispatchX(XEvent* xevent);
 #endif
 
   // Creator of the nested loop.
   MessageLoopForUI::Dispatcher* creator_;
 
   // True to allow nested task in the message loop.
   bool allow_nested_task_;
 
   DISALLOW_COPY_AND_ASSIGN(NestedDispatcherGtk);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_MENU_NESTED_DISPATCHER_GTK_H_