diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-21 16:24:24 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-21 16:24:24 +0000 |
| commit | 4378628c0af281735b7e209e4dbe5ea6bccf3333 (patch) | |
| tree | 453a4f50f27a2768c04d0b70a091808c9aebfe74 /base/message_loop | |
| parent | 85603365427009e0d5b1d88150e363d262e085bc (diff) | |
| download | chromium_src-4378628c0af281735b7e209e4dbe5ea6bccf3333.zip chromium_src-4378628c0af281735b7e209e4dbe5ea6bccf3333.tar.gz chromium_src-4378628c0af281735b7e209e4dbe5ea6bccf3333.tar.bz2 | |
x11: Make the event-source work with both glib and libevent message-pumps.
Split up the X11EventSource into X11EventSourceGlib to work with the glib message-pump,
and X11EventSourceLibevent to work with the libevent message-pump. With this change, it
is possible to build and run chromeos without glib (use_glib = 0).
BUG=354062, 240715
R=darin@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/244093002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265007 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop')
| -rw-r--r-- | base/message_loop/message_loop.cc | 3 | ||||
| -rw-r--r-- | base/message_loop/message_loop.h | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/base/message_loop/message_loop.cc b/base/message_loop/message_loop.cc index 193fe7c..0ca6e81 100644 --- a/base/message_loop/message_loop.cc +++ b/base/message_loop/message_loop.cc @@ -670,7 +670,8 @@ void MessageLoopForUI::RemoveObserver(Observer* observer) { } #endif // !defined(OS_NACL) && defined(OS_WIN) -#if defined(USE_OZONE) && !defined(OS_NACL) +#if !defined(OS_NACL) && \ + (defined(USE_OZONE) || (defined(OS_CHROMEOS) && !defined(USE_GLIB))) bool MessageLoopForUI::WatchFileDescriptor( int fd, bool persistent, diff --git a/base/message_loop/message_loop.h b/base/message_loop/message_loop.h index edb9da7..6617646 100644 --- a/base/message_loop/message_loop.h +++ b/base/message_loop/message_loop.h @@ -34,7 +34,9 @@ #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" @@ -51,7 +53,7 @@ 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; @@ -561,7 +563,8 @@ class BASE_EXPORT MessageLoopForUI : public MessageLoop { 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, |