summaryrefslogtreecommitdiffstats
path: root/base/message_loop.h
diff options
context:
space:
mode:
authordnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-11 18:20:22 +0000
committerdnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-11 18:20:22 +0000
commit4076d2f06b0a9276136436cc1836e3fba8c8ff97 (patch)
tree735b7ed091c74e52142cbc7759aa46f761535b86 /base/message_loop.h
parentf9cdd2a4a1c064d6666816a703e0d84fca555f5f (diff)
downloadchromium_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.h')
-rw-r--r--base/message_loop.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/base/message_loop.h b/base/message_loop.h
index fd9fb7e..9355ec9 100644
--- a/base/message_loop.h
+++ b/base/message_loop.h
@@ -27,11 +27,15 @@
#elif defined(OS_POSIX)
#include "base/message_pump_libevent.h"
#if !defined(OS_MACOSX)
-#if defined(TOUCH_UI)
+
+#if defined(USE_WAYLAND)
+#include "base/message_pump_wayland.h"
+#elif defined(TOUCH_UI)
#include "base/message_pump_x.h"
#else
#include "base/message_pump_gtk.h"
#endif
+
#endif
#endif