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

Index: views/controls/menu/nested_dispatcher_gtk.h
diff --git a/views/controls/menu/nested_dispatcher_gtk.h b/views/controls/menu/nested_dispatcher_gtk.h
index 342ea26b9d3c65b1c2cd9017e2e0ba4c922178eb..0520b4dc71af380fdaa5e784f6edfcded0c61efd 100644
--- a/views/controls/menu/nested_dispatcher_gtk.h
+++ b/views/controls/menu/nested_dispatcher_gtk.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -37,12 +37,11 @@ class NestedDispatcherGtk : public MessageLoopForUI::Dispatcher {
  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.