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/base.gypi | |
| 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/base.gypi')
| -rw-r--r-- | base/base.gypi | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/base/base.gypi b/base/base.gypi index dac1bd2..41ea923 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -368,9 +368,15 @@ 'sources!': [ 'atomicops_internals_x86_gcc.cc', 'message_pump_glib.cc', - 'message_pump_glib_x.cc', + 'message_pump_gtk.cc', + 'message_pump_x.cc', ], }], + [ 'touchui==0', { + 'sources!' : [ 'message_pump_x.cc', ], + }, { + 'sources!' : [ 'message_pump_gtk.cc', ], + }], [ 'OS != "linux"', { 'sources!': [ # Not automatically excluded by the *linux.cc rules. @@ -571,9 +577,10 @@ 'md5.h', 'message_pump_glib.cc', 'message_pump_glib.h', - 'message_pump_glib_x.cc', - 'message_pump_glib_x.h', - 'message_pump_glib_x_dispatch.h', + 'message_pump_gtk.cc', + 'message_pump_gtk.h', + 'message_pump_x.cc', + 'message_pump_x.h', 'message_pump_libevent.cc', 'message_pump_libevent.h', 'message_pump_mac.h', |