Revert 263726 "x11: Remove X11 message-pump."

trunk/src/base/message_loop/message_loop.h

Index: trunk/src/base/message_loop/message_loop.h
===================================================================
--- trunk/src/base/message_loop/message_loop.h	(revision 263732)
+++ trunk/src/base/message_loop/message_loop.h	(working copy)
@@ -34,11 +34,15 @@
 #include "base/message_loop/message_pump_libevent.h"
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
 
-#if defined(USE_GLIB) && !defined(OS_NACL)
-#include "base/message_loop/message_pump_glib.h"
+#if defined(USE_AURA) && defined(USE_X11) && !defined(OS_NACL)
+#include "base/message_loop/message_pump_x11.h"
 #elif !defined(OS_ANDROID_HOST)
-#include "base/message_loop/message_pump_glib.h"
+#define USE_GTK_MESSAGE_PUMP
+#include "base/message_loop/message_pump_gtk.h"
+#if defined(TOOLKIT_GTK)
+#include "base/message_loop/message_pump_x11.h"
 #endif
+#endif
 
 #endif
 #endif
@@ -91,6 +95,8 @@
  public:
 #if defined(OS_WIN)
   typedef MessagePumpObserver Observer;
+#elif defined(USE_GTK_MESSAGE_PUMP)
+  typedef MessagePumpGdkObserver Observer;
 #endif
 
   // A MessageLoop has a particular type, which indicates the set of
@@ -407,7 +413,14 @@
   MessagePumpLibevent* pump_libevent() {
     return static_cast<MessagePumpLibevent*>(pump_.get());
   }
+#if defined(TOOLKIT_GTK)
+  friend class MessagePumpX11;
+  MessagePumpX11* pump_gpu() {
+    DCHECK_EQ(TYPE_GPU, type());
+    return static_cast<MessagePumpX11*>(pump_.get());
+  }
 #endif
+#endif
 
   scoped_ptr<MessagePump> pump_;
 
@@ -580,6 +593,10 @@
 #endif
 
  protected:
+#if defined(USE_X11)
+  friend class MessagePumpX11;
+#endif
+
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
   // TODO(rvargas): Make this platform independent.
   MessagePumpForUI* pump_ui() {