diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 20:58:23 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 20:58:23 +0000 |
| commit | 42968f7ecad14b81cf9187d2b3e7fbb27b93808d (patch) | |
| tree | fbcd9263853ca68ccea8fae6769cd3f82fda704b /base/message_loop | |
| parent | bbd0532177fc8b10c17b243595460135080b0ff0 (diff) | |
| download | chromium_src-42968f7ecad14b81cf9187d2b3e7fbb27b93808d.zip chromium_src-42968f7ecad14b81cf9187d2b3e7fbb27b93808d.tar.gz chromium_src-42968f7ecad14b81cf9187d2b3e7fbb27b93808d.tar.bz2 | |
Remove unnecessary uses of aura::Env::GetDispatcher
Avoid using aura::Env::GetDispatcher() as the dispatcher for new instances of
base::RunLoop()s, since for both Windows and X11, it's the same as the message-pump.
This patch also removes some non-aura views code, and some unnecessary USE_AURA ifdefs.
R=darin@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/154203002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249105 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop')
| -rw-r--r-- | base/message_loop/message_loop.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/base/message_loop/message_loop.cc b/base/message_loop/message_loop.cc index bbf7cd3..689f0d9 100644 --- a/base/message_loop/message_loop.cc +++ b/base/message_loop/message_loop.cc @@ -386,8 +386,7 @@ void MessageLoop::RunHandler() { StartHistogrammer(); -#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ - !defined(USE_GTK_MESSAGE_PUMP) +#if defined(USE_AURA) if (run_loop_->dispatcher_ && type() == TYPE_UI) { static_cast<MessagePumpForUI*>(pump_.get())-> RunWithDispatcher(this, run_loop_->dispatcher_); |