| Index: base/message_loop.cc
|
| diff --git a/base/message_loop.cc b/base/message_loop.cc
|
| index 8f6c997b24afeecbf2597d863e45bfbda063f0f1..f335ca1dba8168c336f119bdc84ec82d02f0b09c 100644
|
| --- a/base/message_loop.cc
|
| +++ b/base/message_loop.cc
|
| @@ -23,6 +23,9 @@
|
| #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;
|
| @@ -134,6 +137,9 @@ MessageLoop::MessageLoop(Type type)
|
| #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()
|
| @@ -533,9 +539,9 @@ bool MessageLoop::DoWork() {
|
| return false;
|
| }
|
|
|
| -bool MessageLoop::DoDelayedWork(Time* next_delayed_work_time) {
|
| +bool MessageLoop::DoDelayedWork(base::Time* next_delayed_work_time) {
|
| if (!nestable_tasks_allowed_ || delayed_work_queue_.empty()) {
|
| - *next_delayed_work_time = Time();
|
| + *next_delayed_work_time = base::Time();
|
| return false;
|
| }
|
|
|
|
|