diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-29 00:32:52 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-29 00:32:52 +0000 |
| commit | e43eddf1a5887c4b249af3daa024c1107ce254a1 (patch) | |
| tree | 994df09c627978ef3fb93a9fadebd00bebbcb31d /base/message_loop.h | |
| parent | a672cb9dce10306f3b149802653dbb554b326a44 (diff) | |
| download | chromium_src-e43eddf1a5887c4b249af3daa024c1107ce254a1.zip chromium_src-e43eddf1a5887c4b249af3daa024c1107ce254a1.tar.gz chromium_src-e43eddf1a5887c4b249af3daa024c1107ce254a1.tar.bz2 | |
Changes to base/ from a combination of FreeBSD and OpenBSD patches.
Review URL: http://codereview.chromium.org/495002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35321 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop.h')
| -rw-r--r-- | base/message_loop.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/base/message_loop.h b/base/message_loop.h index fe28179..0338963 100644 --- a/base/message_loop.h +++ b/base/message_loop.h @@ -21,10 +21,10 @@ #include "base/message_pump_win.h" #elif defined(OS_POSIX) #include "base/message_pump_libevent.h" -#endif -#if defined(OS_LINUX) +#if !defined(OS_MACOSX) #include "base/message_pump_glib.h" #endif +#endif // A MessageLoop is used to process events for a particular thread. There is // at most one MessageLoop instance per thread. @@ -254,7 +254,7 @@ class MessageLoop : public base::MessagePump::Delegate { #if defined(OS_WIN) typedef base::MessagePumpWin::Dispatcher Dispatcher; typedef base::MessagePumpWin::Observer Observer; -#elif defined(OS_LINUX) +#elif !defined(OS_MACOSX) typedef base::MessagePumpForUI::Dispatcher Dispatcher; typedef base::MessagePumpForUI::Observer Observer; #endif @@ -269,7 +269,7 @@ class MessageLoop : public base::MessagePump::Delegate { // once it becomes idle. bool quit_received; -#if defined(OS_WIN) || defined(OS_LINUX) +#if !defined(OS_MACOSX) Dispatcher* dispatcher; #endif }; @@ -457,7 +457,7 @@ class MessageLoopForUI : public MessageLoop { void PumpOutPendingPaintMessages(); #endif -#if defined(OS_WIN) || defined(OS_LINUX) +#if !defined(OS_MACOSX) // Please see message_pump_win/message_pump_glib for definitions of these // methods. void AddObserver(Observer* observer); @@ -469,7 +469,7 @@ class MessageLoopForUI : public MessageLoop { base::MessagePumpForUI* pump_ui() { return static_cast<base::MessagePumpForUI*>(pump_.get()); } -#endif // defined(OS_WIN) || defined(OS_LINUX) +#endif // defined(OS_MACOSX) }; // Do not add any member variables to MessageLoopForUI! This is important b/c |