diff options
| author | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 18:20:22 +0000 |
|---|---|---|
| committer | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 18:20:22 +0000 |
| commit | 4076d2f06b0a9276136436cc1836e3fba8c8ff97 (patch) | |
| tree | 735b7ed091c74e52142cbc7759aa46f761535b86 /base/message_loop.cc | |
| parent | f9cdd2a4a1c064d6666816a703e0d84fca555f5f (diff) | |
| download | chromium_src-4076d2f06b0a9276136436cc1836e3fba8c8ff97.zip chromium_src-4076d2f06b0a9276136436cc1836e3fba8c8ff97.tar.gz chromium_src-4076d2f06b0a9276136436cc1836e3fba8c8ff97.tar.bz2 | |
Adding Wayland message loop and gyp build deps
This CL depends on http://codereview.chromium.org/7457023
BUG=
TEST=
Review URL: http://codereview.chromium.org/7473010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop.cc')
| -rw-r--r-- | base/message_loop.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/base/message_loop.cc b/base/message_loop.cc index 9cef7bf..10f4a26 100644 --- a/base/message_loop.cc +++ b/base/message_loop.cc @@ -31,11 +31,6 @@ #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) #include <gdk/gdk.h> #include <gdk/gdkx.h> -#if defined(TOUCH_UI) -#include "base/message_pump_x.h" -#else -#include "base/message_pump_gtk.h" -#endif // defined(TOUCH_UI) #endif // defined(OS_POSIX) && !defined(OS_MACOSX) using base::TimeDelta; @@ -150,6 +145,9 @@ MessageLoop::MessageLoop(Type type) #elif defined(OS_ANDROID) #define MESSAGE_PUMP_UI new base::MessagePumpForUI() #define MESSAGE_PUMP_IO new base::MessagePumpLibevent() +#elif defined(USE_WAYLAND) +#define MESSAGE_PUMP_UI new base::MessagePumpWayland() +#define MESSAGE_PUMP_IO new base::MessagePumpLibevent() #elif defined(TOUCH_UI) #define MESSAGE_PUMP_UI new base::MessagePumpX() #define MESSAGE_PUMP_IO new base::MessagePumpLibevent() |