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

base/message_pump_glib_x_dispatch.h

Index: base/message_pump_glib_x_dispatch.h
diff --git a/base/message_pump_glib_x_dispatch.h b/base/message_pump_glib_x_dispatch.h
deleted file mode 100644
index 9a2358adecef35c7d24591e64e835cad6e2afc62..0000000000000000000000000000000000000000
--- a/base/message_pump_glib_x_dispatch.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// 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 BASE_MESSAGE_PUMP_GLIB_X_DISPATCH_H
-#define BASE_MESSAGE_PUMP_GLIB_X_DISPATCH_H
-
-#include "base/base_api.h"
-#include "base/message_pump.h"
-#include "base/message_pump_glib.h"
-
-typedef union _XEvent XEvent;
-
-namespace base {
-
-// The message pump used for TOUCH_UI on linux is MessagePumpGlibX, which can
-// dispatch both GdkEvents* and XEvents* captured directly from X.
-// MessagePumpForUI::Dispatcher provides the mechanism for dispatching
-// GdkEvents. This class provides additional mechanism for dispatching XEvents.
-class MessagePumpGlibXDispatcher : public MessagePumpForUI::Dispatcher {
- public:
-  enum DispatchStatus {
-    EVENT_IGNORED,    // The event was not processed.
-    EVENT_PROCESSED,  // The event has been processed.
-    EVENT_QUIT        // The event was processed and the message-loop should
-                      // terminate.
-  };
-
-  // Dispatches the event. EVENT_IGNORED is returned if the event was ignored
-  // (i.e. not processed). EVENT_PROCESSED is returned if the event was
-  // processed. The nested loop exits immediately if EVENT_QUIT is returned.
-  virtual DispatchStatus DispatchX(XEvent* xevent) = 0;
-};
-
-class BASE_API MessagePumpXObserver : public MessagePumpForUI::Observer {
- public:
-  // This method is called before processing an XEvent. If the method returns
-  // true, it indicates the event has already been handled, so the event is not
-  // processed any farther. If the method returns false, the event dispatching
-  // proceeds as normal.
-  virtual bool WillProcessXEvent(XEvent* xevent);
-};
-
-}  // namespace base
-
-#endif  // BASE_MESSAGE_PUMP_GLIB_X_DISPATCH_H