diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-11 23:12:06 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-11 23:12:06 +0000 |
| commit | 0b41c523c5d8eb77c5d3a7cbcfab0068fde55192 (patch) | |
| tree | 96f048a721907c3ac08673099d6d711f40c6eae2 /base/message_loop | |
| parent | b9f062cef514452c644021cac9f9b9ff6686df36 (diff) | |
| download | chromium_src-0b41c523c5d8eb77c5d3a7cbcfab0068fde55192.zip chromium_src-0b41c523c5d8eb77c5d3a7cbcfab0068fde55192.tar.gz chromium_src-0b41c523c5d8eb77c5d3a7cbcfab0068fde55192.tar.bz2 | |
Tweak ifdefs for MessageLoopForUI::Add/RemoveObserver
This is necessitated by our building of base for tools. In particular
if I set OS_ANDROID and USE_AURA then the host is built with OS_LINUX
and USE_AURA, but none of the other flags we normally set if USE_AURA
is set for OS_LINUX.
And yes, I really need to spend time and refactor messageloop. It is
such a mess of ifdefs right now.
BUG=none
TEST=none
R=darin@chromium.org
Review URL: https://codereview.chromium.org/129873003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244386 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop')
| -rw-r--r-- | base/message_loop/message_loop.cc | 4 | ||||
| -rw-r--r-- | base/message_loop/message_loop.h | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/base/message_loop/message_loop.cc b/base/message_loop/message_loop.cc index 712fcfa..bbf7cd3 100644 --- a/base/message_loop/message_loop.cc +++ b/base/message_loop/message_loop.cc @@ -665,7 +665,8 @@ void MessageLoopForUI::Attach() { } #endif -#if !defined(OS_MACOSX) && !defined(OS_NACL) && !defined(OS_ANDROID) +#if !defined(OS_NACL) && (defined(TOOLKIT_GTK) || defined(USE_OZONE) || \ + defined(OS_WIN) || defined(USE_X11)) void MessageLoopForUI::AddObserver(Observer* observer) { pump_ui()->AddObserver(observer); } @@ -673,7 +674,6 @@ void MessageLoopForUI::AddObserver(Observer* observer) { void MessageLoopForUI::RemoveObserver(Observer* observer) { pump_ui()->RemoveObserver(observer); } - #endif // !defined(OS_MACOSX) && !defined(OS_NACL) && !defined(OS_ANDROID) //------------------------------------------------------------------------------ diff --git a/base/message_loop/message_loop.h b/base/message_loop/message_loop.h index 04709e6..59c6cdc 100644 --- a/base/message_loop/message_loop.h +++ b/base/message_loop/message_loop.h @@ -580,12 +580,15 @@ class BASE_EXPORT MessageLoopForUI : public MessageLoop { // never be called. Instead use Start(), which will forward all the native UI // events to the Java message loop. void Start(); -#elif !defined(OS_MACOSX) +#endif +#if !defined(OS_NACL) && (defined(TOOLKIT_GTK) || defined(USE_OZONE) || \ + defined(OS_WIN) || defined(USE_X11)) // Please see message_pump_win/message_pump_glib for definitions of these // methods. void AddObserver(Observer* observer); void RemoveObserver(Observer* observer); +#endif #if defined(OS_WIN) // Plese see MessagePumpForUI for definitions of this method. @@ -602,11 +605,12 @@ class BASE_EXPORT MessageLoopForUI : public MessageLoop { friend class MessagePumpOzone; #endif +#if !defined(OS_MACOSX) && !defined(OS_ANDROID) // TODO(rvargas): Make this platform independent. MessagePumpForUI* pump_ui() { return static_cast<MessagePumpForUI*>(pump_.get()); } -#endif // !defined(OS_MACOSX) +#endif }; // Do not add any member variables to MessageLoopForUI! This is important b/c |