x11: Make the event-source work with both glib and libevent message-pumps.

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 16 matching lines @@
 
 // TODO(sky): these includes should not be necessary. Nuke them.
 #if defined(OS_WIN)
 #include "base/message_loop/message_pump_win.h"
 #elif defined(OS_IOS)
 #include "base/message_loop/message_pump_io_ios.h"
 #elif defined(OS_POSIX)
 #include "base/message_loop/message_pump_libevent.h"
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
 
-#if defined(USE_GLIB) && !defined(OS_NACL)
+#if defined(OS_CHROMEOS) && !defined(OS_NACL) && !defined(USE_GLIB)
+#include "base/message_loop/message_pump_libevent.h"
+#elif defined(USE_GLIB) && !defined(OS_NACL)
 #include "base/message_loop/message_pump_glib.h"
 #elif !defined(OS_ANDROID_HOST)
 #include "base/message_loop/message_pump_glib.h"
 #endif
 
 #endif
 #endif
 
 namespace base {
 
 class HistogramBase;
 class MessagePumpObserver;
 class RunLoop;
 class ThreadTaskRunnerHandle;
 #if defined(OS_ANDROID)
 class MessagePumpForUI;
-#elif defined(OS_ANDROID_HOST)
+#elif defined(OS_ANDROID_HOST) || (defined(OS_CHROMEOS) && !defined(USE_GLIB))
 typedef MessagePumpLibevent MessagePumpForUI;
 #endif
 class WaitableEvent;
 
 // A MessageLoop is used to process events for a particular thread.  There is
 // at most one MessageLoop instance per thread.
 //
 // Events include at a minimum Task instances submitted to PostTask and its
 // variants.  Depending on the type of message pump used by the MessageLoop
 // other events such as UI messages may be processed.  On Windows APC calls (as
@@ skipping 489 matching lines @@
   // events to the Java message loop.
   void Start();
 #endif
 
 #if !defined(OS_NACL) && defined(OS_WIN)
   // Please see message_pump_win for definitions of these methods.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 #endif
 
-#if defined(USE_OZONE) && !defined(OS_NACL)
+#if !defined(OS_NACL) && \
+    (defined(USE_OZONE) || (defined(OS_CHROMEOS) && !defined(USE_GLIB)))
   // Please see MessagePumpLibevent for definition.
   bool WatchFileDescriptor(
       int fd,
       bool persistent,
       MessagePumpLibevent::Mode mode,
       MessagePumpLibevent::FileDescriptorWatcher* controller,
       MessagePumpLibevent::Watcher* delegate);
 #endif
 
  protected:
@@ skipping 114 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_