Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(156)

Side by Side Diff: chrome/browser/nacl_host/nacl_process_host.cc

Issue 15984016: Call scoped_refptr<T>::get() rather than relying on implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/nacl_host/nacl_process_host.h" 5 #include "chrome/browser/nacl_host/nacl_process_host.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/base_switches.h" 10 #include "base/base_switches.h"
(...skipping 809 matching lines...) Expand 10 before | Expand all | Expand 10 after
820 DCHECK(enable_ppapi_proxy()); 820 DCHECK(enable_ppapi_proxy());
821 // If the proxy channel is null, this must be the initial NaCl-Browser IPC 821 // If the proxy channel is null, this must be the initial NaCl-Browser IPC
822 // channel. 822 // channel.
823 if (!ipc_proxy_channel_.get()) { 823 if (!ipc_proxy_channel_.get()) {
824 DCHECK_EQ(PROCESS_TYPE_NACL_LOADER, process_->GetData().process_type); 824 DCHECK_EQ(PROCESS_TYPE_NACL_LOADER, process_->GetData().process_type);
825 825
826 ipc_proxy_channel_.reset( 826 ipc_proxy_channel_.reset(
827 new IPC::ChannelProxy(channel_handle, 827 new IPC::ChannelProxy(channel_handle,
828 IPC::Channel::MODE_CLIENT, 828 IPC::Channel::MODE_CLIENT,
829 &ipc_plugin_listener_, 829 &ipc_plugin_listener_,
830 base::MessageLoopProxy::current())); 830 base::MessageLoopProxy::current().get()));
831 // Create the browser ppapi host and enable PPAPI message dispatching to the 831 // Create the browser ppapi host and enable PPAPI message dispatching to the
832 // browser process. 832 // browser process.
833 ppapi_host_.reset(content::BrowserPpapiHost::CreateExternalPluginProcess( 833 ppapi_host_.reset(content::BrowserPpapiHost::CreateExternalPluginProcess(
834 ipc_proxy_channel_.get(), // sender 834 ipc_proxy_channel_.get(), // sender
835 permissions_, 835 permissions_,
836 process_->GetData().handle, 836 process_->GetData().handle,
837 ipc_proxy_channel_.get(), 837 ipc_proxy_channel_.get(),
838 chrome_render_message_filter_->GetHostResolver(), 838 chrome_render_message_filter_->GetHostResolver(),
839 chrome_render_message_filter_->render_process_id(), 839 chrome_render_message_filter_->render_process_id(),
840 render_view_id_, 840 render_view_id_,
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
1068 } else { 1068 } else {
1069 NaClStartDebugExceptionHandlerThread( 1069 NaClStartDebugExceptionHandlerThread(
1070 process_handle.Take(), info, 1070 process_handle.Take(), info,
1071 base::MessageLoopProxy::current(), 1071 base::MessageLoopProxy::current(),
1072 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, 1072 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
1073 weak_factory_.GetWeakPtr())); 1073 weak_factory_.GetWeakPtr()));
1074 return true; 1074 return true;
1075 } 1075 }
1076 } 1076 }
1077 #endif 1077 #endif
OLDNEW
« no previous file with comments | « chrome/browser/nacl_host/nacl_browser.cc ('k') | chrome/browser/nacl_host/pnacl_translation_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698