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

views/focus/accelerator_handler.h

Index: views/focus/accelerator_handler.h
diff --git a/views/focus/accelerator_handler.h b/views/focus/accelerator_handler.h
index b10b58789c749bee8a79c36745fcc91d34c00f17..44b411f9b6292861d2b2c16fdf3296a9fc543783 100644
--- a/views/focus/accelerator_handler.h
+++ b/views/focus/accelerator_handler.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -41,11 +41,10 @@ class AcceleratorHandler : public MessageLoopForUI::Dispatcher {
   // focus manager
 #if defined(OS_WIN)
   virtual bool Dispatch(const MSG& msg);
+#elif defined(TOUCH_UI)
+  virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(XEvent* xev);
 #else
   virtual bool Dispatch(GdkEvent* event);
-#if defined(TOUCH_UI)
-  virtual MessagePumpGlibXDispatcher::DispatchStatus DispatchX(XEvent* xev);
-#endif
 #endif
 
  private: