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 /apps | |
| 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 'apps')
| -rw-r--r-- | apps/app_shim/app_shim_host_mac.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/app_shim/app_shim_host_mac.cc b/apps/app_shim/app_shim_host_mac.cc index 7ae2dd6..3b4423b 100644 --- a/apps/app_shim/app_shim_host_mac.cc +++ b/apps/app_shim/app_shim_host_mac.cc @@ -28,9 +28,12 @@ AppShimHost::~AppShimHost() { void AppShimHost::ServeChannel(const IPC::ChannelHandle& handle) { DCHECK(CalledOnValidThread()); DCHECK(!channel_.get()); - channel_.reset(new IPC::ChannelProxy(handle, IPC::Channel::MODE_SERVER, this, + channel_.reset(new IPC::ChannelProxy( + handle, + IPC::Channel::MODE_SERVER, + this, content::BrowserThread::GetMessageLoopProxyForThread( - content::BrowserThread::IO))); + content::BrowserThread::IO).get())); } Profile* AppShimHost::GetProfile() const { |