Revert 222689 "Use an X event loop in the GPU process on Linux."

trunk/src/base/message_loop/message_loop.h

 // Copyright 2013 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_LOOP_MESSAGE_LOOP_H_
 #define BASE_MESSAGE_LOOP_MESSAGE_LOOP_H_
 
 #include <queue>
 #include <string>
 
@@ skipping 24 matching lines @@
 #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"
 #elif defined(USE_OZONE) && !defined(OS_NACL)
 #include "base/message_loop/message_pump_ozone.h"
 #else
 #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
 
 namespace base {
 
 class HistogramBase;
 class MessagePumpDispatcher;
 class MessagePumpObserver;
@@ skipping 48 matching lines @@
   // A MessageLoop has a particular type, which indicates the set of
   // asynchronous events it may process in addition to tasks and timers.
   //
   // TYPE_DEFAULT
   //   This type of ML only supports tasks and timers.
   //
   // TYPE_UI
   //   This type of ML also supports native UI events (e.g., Windows messages).
   //   See also MessageLoopForUI.
   //
-  // TYPE_GPU
-  //   This type of ML also supports native UI events for use in the GPU
-  //   process. On Linux this will always be an X11 ML (as compared with the
-  //   sometimes-GTK ML in the browser process).
-  //
   // TYPE_IO
   //   This type of ML also supports asynchronous IO.  See also
   //   MessageLoopForIO.
   //
   // TYPE_JAVA
   //   This type of ML is backed by a Java message handler which is responsible
   //   for running the tasks added to the ML. This is only for use on Android.
   //   TYPE_JAVA behaves in essence like TYPE_UI, except during construction
   //   where it does not use the main thread specific pump factory.
   //
   enum Type {
     TYPE_DEFAULT,
     TYPE_UI,
-#if defined(TOOLKIT_GTK)
-    TYPE_GPU,
-#endif
     TYPE_IO,
 #if defined(OS_ANDROID)
     TYPE_JAVA,
 #endif // defined(OS_ANDROID)
   };
 
   // Normally, it is not necessary to instantiate a MessageLoop.  Instead, it
   // is typical to make use of the current thread's MessageLoop instance.
   explicit MessageLoop(Type type = TYPE_DEFAULT);
   virtual ~MessageLoop();
@@ skipping 273 matching lines @@
  protected:
 
 #if defined(OS_WIN)
   MessagePumpWin* pump_win() {
     return static_cast<MessagePumpWin*>(pump_.get());
   }
 #elif defined(OS_POSIX) && !defined(OS_IOS)
   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_;
 
  private:
   friend class internal::IncomingTaskQueue;
   friend class RunLoop;
 
   // A function to encapsulate all the exception handling capability in the
   // stacks around the running of a main message loop.  It will run the message
@@ skipping 163 matching lines @@
   void RemoveObserver(Observer* observer);
 
 #if defined(OS_WIN)
   // Plese see MessagePumpForUI for definitions of this method.
   void SetMessageFilter(scoped_ptr<MessageFilter> message_filter) {
     pump_ui()->SetMessageFilter(message_filter.Pass());
   }
 #endif
 
  protected:
-#if defined(USE_X11)
+#if defined(USE_AURA) && defined(USE_X11) && !defined(OS_NACL)
   friend class MessagePumpX11;
 #endif
 #if defined(USE_OZONE) && !defined(OS_NACL)
   friend class MessagePumpOzone;
 #endif
 
   // TODO(rvargas): Make this platform independent.
   MessagePumpForUI* pump_ui() {
     return static_cast<MessagePumpForUI*>(pump_.get());
   }
@@ skipping 104 matching lines @@
 
 // Do not add any member variables to MessageLoopForIO!  This is important b/c
 // MessageLoopForIO is often allocated via MessageLoop(TYPE_IO).  Any extra
 // data that you need should be stored on the MessageLoop's pump_ instance.
 COMPILE_ASSERT(sizeof(MessageLoop) == sizeof(MessageLoopForIO),
                MessageLoopForIO_should_not_have_extra_member_variables);
 
 }  // namespace base
 
 #endif  // BASE_MESSAGE_LOOP_MESSAGE_LOOP_H_