diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-13 19:27:51 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-13 19:27:51 +0000 |
| commit | ab9fe0f8b3127a8cc224322107d2f77fe0a9ef38 (patch) | |
| tree | 40a0f93e46235dcb04514e4fbee65c874ddf6b71 /base/message_loop.cc | |
| parent | 32354b64deff166de178809850f379da837819eb (diff) | |
| download | chromium_src-ab9fe0f8b3127a8cc224322107d2f77fe0a9ef38.zip chromium_src-ab9fe0f8b3127a8cc224322107d2f77fe0a9ef38.tar.gz chromium_src-ab9fe0f8b3127a8cc224322107d2f77fe0a9ef38.tar.bz2 | |
Revert r114168 "Refactor MessagePumpX to dispatch events inside of the source Dispatch function."
This reverts commit bae6675d851184f2be0ac117c1a847289c1c7bd9.
TBR=piman@chromium.org
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8931009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop.cc')
| -rw-r--r-- | base/message_loop.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/base/message_loop.cc b/base/message_loop.cc index c7efe32..ca85d6a 100644 --- a/base/message_loop.cc +++ b/base/message_loop.cc @@ -147,13 +147,22 @@ MessageLoop::MessageLoop(Type type) #elif defined(OS_MACOSX) #define MESSAGE_PUMP_UI base::MessagePumpMac::Create() #define MESSAGE_PUMP_IO new base::MessagePumpLibevent() +#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(USE_AURA) +#define MESSAGE_PUMP_UI new base::MessagePumpX() +#define MESSAGE_PUMP_IO new base::MessagePumpLibevent() #elif defined(OS_NACL) // Currently NaCl doesn't have a UI or an IO MessageLoop. // TODO(abarth): Figure out if we need these. #define MESSAGE_PUMP_UI NULL #define MESSAGE_PUMP_IO NULL #elif defined(OS_POSIX) // POSIX but not MACOSX. -#define MESSAGE_PUMP_UI new base::MessagePumpForUI() +#define MESSAGE_PUMP_UI new base::MessagePumpGtk() #define MESSAGE_PUMP_IO new base::MessagePumpLibevent() #else #error Not implemented |