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
CrOS-Libchrome-Original-Commit: 4076d2f06b0a9276136436cc1836e3fba8c8ff97
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 @@
#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()