commit f59198cf29d949cc2c8320e4900bd4502cebd93c
author sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Apr 15 12:34:54 2014 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 16:28:25 2020 +0900
tree 3fce4ea0357b1b559449785db7f85f21261234fd
parent e3e7ddea5255e4f2c5845d4d6fe6ab0ca13e53a4

x11: Remove X11 message-pump.

The remaining use of the X11 mesage-pump was opening the connection to the
X11 server. This patch moves that out of the message-pump, into gfx. This
allows us to remove the X11 message-pump, and just use the base Glib-based
message-pump on Linux and ChromeOS.

BUG=354062
R=darin@chromium.org, sky@chromium.org

Previously landed in r263726, but reverted in r263733 to allow reverting another CL.

Review URL: https://codereview.chromium.org/235043005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263777 0039d316-1c4b-4281-b951-d872f2087c98


CrOS-Libchrome-Original-Commit: 82f884d6ffb1406788add09179de956d1d53c19a

base/message_loop/message_loop.h

diff --git a/base/message_loop/message_loop.h b/base/message_loop/message_loop.h
index 6539c65..07f9105 100644
--- a/base/message_loop/message_loop.h
+++ b/base/message_loop/message_loop.h
@@ -34,14 +34,10 @@
 #include "base/message_loop/message_pump_libevent.h"
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
 
-#if defined(USE_AURA) && defined(USE_X11) && !defined(OS_NACL)
-#include "base/message_loop/message_pump_x11.h"
+#if defined(USE_GLIB) && !defined(OS_NACL)
+#include "base/message_loop/message_pump_glib.h"
 #elif !defined(OS_ANDROID_HOST)
-#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
+#include "base/message_loop/message_pump_glib.h"
 #endif
 
 #endif
@@ -95,8 +91,6 @@
  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
@@ -413,13 +407,6 @@
   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_;
@@ -593,10 +580,6 @@
 #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() {