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

ui/views/focus/accelerator_handler.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 UI_VIEWS_FOCUS_ACCELERATOR_HANDLER_H_
 #define UI_VIEWS_FOCUS_ACCELERATOR_HANDLER_H_
 #pragma once
 
 #include "build/build_config.h"
 
@@ skipping 32 matching lines @@
 //  controls within a window need to be Widgets - some are native controls from
 //  the underlying toolkit wrapped by NativeViewHost.
 //
 class AcceleratorHandler : public MessageLoopForUI::Dispatcher {
  public:
    AcceleratorHandler();
   // Dispatcher method. This returns true if an accelerator was processed by the
   // focus manager
 #if defined(OS_WIN)
   virtual bool Dispatch(const MSG& msg);
+#elif defined(TOUCH_UI)
+  virtual MesasgePumpDispatcher::DispatchStatus Dispatch(XEvent* xev);
 #else
   virtual bool Dispatch(GdkEvent* event);
-#if defined(TOUCH_UI)
-  virtual MessagePumpGlibXDispatcher::DispatchStatus Dispatch(XEvent* xev);
-#endif
 #endif
 
  private:
 #if defined(OS_WIN)
   // The keys currently pressed and consumed by the FocusManager.
   std::set<WPARAM> pressed_keys_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratorHandler);
 };
 
 }  // namespace ui
 
 #endif  // UI_VIEWS_FOCUS_ACCELERATOR_HANDLER_H_