diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-09 19:50:06 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-09 19:50:06 +0000 |
| commit | 046460d54e5397286cba1b3ce9462b4129b2aaab (patch) | |
| tree | 79b0e31f0a28b01ae9b1dfd12dad5be6fa3368b4 /base/message_loop.h | |
| parent | c90ec6552b57ec596c35a4c44082ad518857a393 (diff) | |
| download | chromium_src-046460d54e5397286cba1b3ce9462b4129b2aaab.zip chromium_src-046460d54e5397286cba1b3ce9462b4129b2aaab.tar.gz chromium_src-046460d54e5397286cba1b3ce9462b4129b2aaab.tar.bz2 | |
Consolidate win/x dispatchers
BUG=116282
TEST=no functional change. All tests should pass.
Review URL: http://codereview.chromium.org/9958152
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131412 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop.h')
| -rw-r--r-- | base/message_loop.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/base/message_loop.h b/base/message_loop.h index 4527c5b..c1ffc89 100644 --- a/base/message_loop.h +++ b/base/message_loop.h @@ -77,10 +77,8 @@ class Histogram; // class BASE_EXPORT MessageLoop : public base::MessagePump::Delegate { public: -#if defined(OS_WIN) - typedef base::MessagePumpWin::Dispatcher Dispatcher; - typedef base::MessagePumpObserver Observer; -#elif !defined(OS_MACOSX) && !defined(OS_ANDROID) + +#if !defined(OS_MACOSX) && !defined(OS_ANDROID) typedef base::MessagePumpDispatcher Dispatcher; typedef base::MessagePumpObserver Observer; #endif |