diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 20:55:59 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 20:55:59 +0000 |
| commit | 8e50de7369c44f135a94e779f7b9ff3857a04243 (patch) | |
| tree | a876d0fdf119362bcb7f6ba7ea4e48ce29141450 | |
| parent | 36de1cbdf69c7bfba95f5b7c200e8ca78f1b9f9d (diff) | |
| download | chromium_src-8e50de7369c44f135a94e779f7b9ff3857a04243.zip chromium_src-8e50de7369c44f135a94e779f7b9ff3857a04243.tar.gz chromium_src-8e50de7369c44f135a94e779f7b9ff3857a04243.tar.bz2 | |
Revert 102009 - Follow up fix from r102005: Fix static build of base_unittests.
TBR=evan@chromium.org
BUG=97131
TEST=none
Review URL: http://codereview.chromium.org/7979010
TBR=sadrul@chromium.org
Review URL: http://codereview.chromium.org/7983020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102014 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/base.gypi | 2 | ||||
| -rw-r--r-- | base/message_pump_x.cc | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/base/base.gypi b/base/base.gypi index 3332b6b..0de2c24 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -398,7 +398,7 @@ 'sources!' : [ 'message_pump_x.cc', ], }, { 'sources!' : [ 'message_pump_gtk.cc', ], - 'sources/' : [ [ 'include', 'message_pump_x.cc', ] ], + 'sources' : [ 'message_pump_x.cc', ], }], [ 'OS != "linux"', { 'sources!': [ diff --git a/base/message_pump_x.cc b/base/message_pump_x.cc index f9a2b6f..b0be50b 100644 --- a/base/message_pump_x.cc +++ b/base/message_pump_x.cc @@ -247,16 +247,6 @@ bool MessagePumpX::RunOnce(GMainContext* context, bool block) { return retvalue; } -bool MessagePumpX::WillProcessXEvent(XEvent* xevent) { - ObserverListBase<MessagePumpObserver>::Iterator it(observers()); - MessagePumpObserver* obs; - while ((obs = it.GetNext()) != NULL) { - if (obs->WillProcessXEvent(xevent)) - return true; - } - return false; -} - #if defined(TOOLKIT_USES_GTK) GdkFilterReturn MessagePumpX::GdkEventFilter(GdkXEvent* gxevent, GdkEvent* gevent, @@ -272,6 +262,16 @@ GdkFilterReturn MessagePumpX::GdkEventFilter(GdkXEvent* gxevent, return GDK_FILTER_CONTINUE; } +bool MessagePumpX::WillProcessXEvent(XEvent* xevent) { + ObserverListBase<MessagePumpObserver>::Iterator it(observers()); + MessagePumpObserver* obs; + while ((obs = it.GetNext()) != NULL) { + if (obs->WillProcessXEvent(xevent)) + return true; + } + return false; +} + void MessagePumpX::EventDispatcherX(GdkEvent* event, gpointer data) { MessagePumpX* pump_x = reinterpret_cast<MessagePumpX*>(data); CHECK(use_gtk_message_pump) << "GdkEvent:" << event->type; |