diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-24 20:10:25 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-24 20:10:25 +0000 |
| commit | 2047ef4d68229d47cba8bf7f2e0465ab31f8b3ce (patch) | |
| tree | 86af296c2de9e5ac31c9ed79e21d9d0e4ccda8c4 /base/message_loop.cc | |
| parent | 86e1db9d9de1ce72ba045bd3755e7a077a1f7fd8 (diff) | |
| download | chromium_src-2047ef4d68229d47cba8bf7f2e0465ab31f8b3ce.zip chromium_src-2047ef4d68229d47cba8bf7f2e0465ab31f8b3ce.tar.gz chromium_src-2047ef4d68229d47cba8bf7f2e0465ab31f8b3ce.tar.bz2 | |
Refactor the glib message-pump, and use it as the base for a gtk message pump and an X message pump.
The changes:
* Rename MessagePumpGlibX to MessagePumpX.
* Rename MessagePumpForUI to MessagePumpGlib.
* Move some stuff out of MessagePumpGlib, and into MessagePumpGtk and MessagePumpX.
* Rename MessagePumpForUI::Observer to MessageObserver, moved the platform-specific implementations into MessagePumpGtk and MessagePumpX. Ditto for MessagePumpForUI::Dispatcher.
MessagePumpX is independent of MessagePumpGtk. At the moment, MessagePumpX does process some GDK event, but once we have a complete native_widget_x, we can take out the GDK processing and things should continue to work.
BUG=none
TEST=existing message-pump tests.
Review URL: http://codereview.chromium.org/7250001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90418 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop.cc')
| -rw-r--r-- | base/message_loop.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/base/message_loop.cc b/base/message_loop.cc index b0526f4..e45c0d7 100644 --- a/base/message_loop.cc +++ b/base/message_loop.cc @@ -25,14 +25,16 @@ #if defined(OS_POSIX) #include "base/message_pump_libevent.h" #endif + #if defined(OS_POSIX) && !defined(OS_MACOSX) #include <gdk/gdk.h> #include <gdk/gdkx.h> -#include "base/message_pump_glib.h" -#endif #if defined(TOUCH_UI) -#include "base/message_pump_glib_x.h" -#endif +#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; using base::TimeTicks; @@ -176,7 +178,7 @@ MessageLoop::MessageLoop(Type type) #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_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. @@ -184,7 +186,7 @@ MessageLoop::MessageLoop(Type type) #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 |