diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 22:51:50 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 22:51:50 +0000 |
| commit | e66f0263e6f8333d9310bb595af5b912360a65c3 (patch) | |
| tree | 71667742fc12aab9b840c27a1730f34f5acb456e /media/audio/audio_manager_base.cc | |
| parent | ae6ef14fe8d5c5df694efc7e09bcf86e4747d7ad (diff) | |
| download | chromium_src-e66f0263e6f8333d9310bb595af5b912360a65c3.zip chromium_src-e66f0263e6f8333d9310bb595af5b912360a65c3.tar.gz chromium_src-e66f0263e6f8333d9310bb595af5b912360a65c3.tar.bz2 | |
Update OS X to use scoped_refptr<T>::get() rather than implicit "operator T*"
OS X fixes and post-Linux cleanup
BUG=110610
TBR=darin
Review URL: https://codereview.chromium.org/16402003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206189 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/audio_manager_base.cc')
| -rw-r--r-- | media/audio/audio_manager_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc index 220e0b6..7ffc7d3 100644 --- a/media/audio/audio_manager_base.cc +++ b/media/audio/audio_manager_base.cc @@ -92,7 +92,7 @@ AudioManagerBase::AudioManagerBase() // TODO(dalecurtis): We should require the message loop to be passed in. const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); if (!cmd_line->HasSwitch(switches::kDisableMainThreadAudio) && - base::MessageLoopProxy::current() && + base::MessageLoopProxy::current().get() && base::MessageLoop::current()->IsType(base::MessageLoop::TYPE_UI)) { message_loop_ = base::MessageLoopProxy::current(); return; |