From c8ef1d0bc63aa014ba0fb94049671b371c0d5d18 Mon Sep 17 00:00:00 2001 From: "sadrul@chromium.org" Date: Mon, 14 Apr 2014 21:13:20 +0000 Subject: 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 Review URL: https://codereview.chromium.org/235043005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263726 0039d316-1c4b-4281-b951-d872f2087c98 --- base/message_loop/message_loop.h | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) (limited to '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 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate { 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 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate { MessagePumpLibevent* pump_libevent() { return static_cast(pump_.get()); } -#if defined(TOOLKIT_GTK) - friend class MessagePumpX11; - MessagePumpX11* pump_gpu() { - DCHECK_EQ(TYPE_GPU, type()); - return static_cast(pump_.get()); - } -#endif #endif scoped_ptr pump_; @@ -593,10 +580,6 @@ class BASE_EXPORT MessageLoopForUI : public MessageLoop { #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() { -- cgit v1.1