diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-07 01:13:39 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-07 01:13:39 +0000 |
| commit | 827d38ae4b2bbd630b8950edbb52a83c5329593f (patch) | |
| tree | 1d164cd6dc130ff12cd935fadbb1503f4426d5f2 /base/run_loop.h | |
| parent | 926bfe36e5ecc460bf274ad3d81fe6e4a89cc468 (diff) | |
| download | chromium_src-827d38ae4b2bbd630b8950edbb52a83c5329593f.zip chromium_src-827d38ae4b2bbd630b8950edbb52a83c5329593f.tar.gz chromium_src-827d38ae4b2bbd630b8950edbb52a83c5329593f.tar.bz2 | |
gtk: Some code cleanup for the message-pump.
GTK message-pump defines its own observer, but it has the same name as the
message-pump observers used in other platforms. So rename the GTK version
to MessagePumpGdkObserver.
Also, GTK version of message-pump dispatcher is never used, so get rid of
that.
BUG=145600
R=piman@chromium.org, thakis@chromium.org
Review URL: https://codereview.chromium.org/23537016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221846 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/run_loop.h')
| -rw-r--r-- | base/run_loop.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/base/run_loop.h b/base/run_loop.h index 42a5160..f5ee5c3 100644 --- a/base/run_loop.h +++ b/base/run_loop.h @@ -27,12 +27,14 @@ class MessagePumpUIApplication; class BASE_EXPORT RunLoop { public: RunLoop(); -#if !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ + !defined(USE_GTK_MESSAGE_PUMP) explicit RunLoop(MessageLoop::Dispatcher* dispatcher); #endif ~RunLoop(); -#if !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ + !defined(USE_GTK_MESSAGE_PUMP) void set_dispatcher(MessageLoop::Dispatcher* dispatcher) { dispatcher_ = dispatcher; } @@ -98,7 +100,8 @@ class BASE_EXPORT RunLoop { // Parent RunLoop or NULL if this is the top-most RunLoop. RunLoop* previous_run_loop_; -#if !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ + !defined(USE_GTK_MESSAGE_PUMP) MessageLoop::Dispatcher* dispatcher_; #endif |