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

chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h

Index: chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h
diff --git a/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h b/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h
index 7c37ac3769e15a1899e5b2fb16e18d37ba5fa0f6..0cb4fad0d3f4365575bf839519bc81d8853026ab 100644
--- a/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h
+++ b/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h
@@ -36,6 +36,10 @@ class XInputHierarchyChangedEventListener : public MessageLoopForUI::Observer {
   XInputHierarchyChangedEventListener();
   virtual ~XInputHierarchyChangedEventListener();
 
+#if defined(TOUCH_UI)
+  // MessageLoopForUI::Observer overrides.
+  virtual EventStatus WillProcessXEvent(XEvent* xevent) OVERRIDE;
+#else
   // When TOUCH_UI is not defined, WillProcessXEvent() will not be called
   // automatically. We have to call the function manually by adding the Gdk
   // event filter.
@@ -46,11 +50,10 @@ class XInputHierarchyChangedEventListener : public MessageLoopForUI::Observer {
   // MessageLoopForUI::Observer overrides.
   virtual void WillProcessEvent(GdkEvent* event) OVERRIDE {}
   virtual void DidProcessEvent(GdkEvent* event) OVERRIDE {}
-  virtual bool WillProcessXEvent(XEvent* xevent)
-#if defined(TOUCH_UI)
-    OVERRIDE
 #endif
-    ;
+
+  // Returns true if the event was processed, false otherwise.
+  virtual bool ProcessedXEvent(XEvent* xevent);
 
   bool stopped_;
   int xiopcode_;