Revert 63397 - Add a message pump for touchui=1
The message pump reads events directly from X. For most events, it passes them
on to GDK for normal processing. It consumes some events (e.g. keypress events)
to demonstrate how it's intended to work. This, of course, makes chrome mostly
unusable since you can only use the mouse to do things. But this is a small
first step towards capturing events through MPX (e.g. touch etc.) and processing
them as chrome pleases.
glib message pump: Slightly change architecture
This changeset breaks down the glib message pump a little so that it can be
easily subclassed. The next set of commits will introduce a subclass that still
uses GTK and GDK widgets, but reads events directly from X instead of through
GTK/GDK.
Review URL: http://codereview.chromium.org/3748002
Patch from Sadrul Chowdhury <sadrul@chromium.org>.
TBR=rjkroege@google.com
Probably a dynamic link problem with -lX11.
Review URL: http://codereview.chromium.org/4007004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63403 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: 9317bdedaac5718c5499efe081df23c2d6903d80
diff --git a/base/message_loop.cc b/base/message_loop.cc
index f335ca1..8f6c997 100644
--- a/base/message_loop.cc
+++ b/base/message_loop.cc
@@ -23,9 +23,6 @@
#if defined(OS_POSIX) && !defined(OS_MACOSX)
#include "base/message_pump_glib.h"
#endif
-#if defined(TOUCH_UI)
-#include "base/message_pump_glib_x.h"
-#endif
using base::Time;
using base::TimeDelta;
@@ -137,9 +134,6 @@
#elif defined(OS_MACOSX)
#define MESSAGE_PUMP_UI base::MessagePumpMac::Create()
#define MESSAGE_PUMP_IO new base::MessagePumpLibevent()
-#elif defined(TOUCH_UI)
-#define MESSAGE_PUMP_UI new base::MessagePumpGlibX()
-#define MESSAGE_PUMP_IO new base::MessagePumpLibevent()
#elif defined(OS_POSIX) // POSIX but not MACOSX.
#define MESSAGE_PUMP_UI new base::MessagePumpForUI()
#define MESSAGE_PUMP_IO new base::MessagePumpLibevent()
@@ -539,9 +533,9 @@
return false;
}
-bool MessageLoop::DoDelayedWork(base::Time* next_delayed_work_time) {
+bool MessageLoop::DoDelayedWork(Time* next_delayed_work_time) {
if (!nestable_tasks_allowed_ || delayed_work_queue_.empty()) {
- *next_delayed_work_time = base::Time();
+ *next_delayed_work_time = Time();
return false;
}