OLD | NEW |
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 <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
717 IPC::Channel::MODE_CLIENT, | 717 IPC::Channel::MODE_CLIENT, |
718 &ipc_plugin_listener_, | 718 &ipc_plugin_listener_, |
719 base::MessageLoopProxy::current().get())); | 719 base::MessageLoopProxy::current().get())); |
720 // Create the browser ppapi host and enable PPAPI message dispatching to the | 720 // Create the browser ppapi host and enable PPAPI message dispatching to the |
721 // browser process. | 721 // browser process. |
722 ppapi_host_.reset(content::BrowserPpapiHost::CreateExternalPluginProcess( | 722 ppapi_host_.reset(content::BrowserPpapiHost::CreateExternalPluginProcess( |
723 ipc_proxy_channel_.get(), // sender | 723 ipc_proxy_channel_.get(), // sender |
724 permissions_, | 724 permissions_, |
725 process_->GetData().handle, | 725 process_->GetData().handle, |
726 ipc_proxy_channel_.get(), | 726 ipc_proxy_channel_.get(), |
727 nacl_host_message_filter_->GetHostResolver(), | |
728 nacl_host_message_filter_->render_process_id(), | 727 nacl_host_message_filter_->render_process_id(), |
729 render_view_id_, | 728 render_view_id_, |
730 profile_directory_)); | 729 profile_directory_)); |
731 | 730 |
732 ppapi::PpapiNaClChannelArgs args; | 731 ppapi::PpapiNaClChannelArgs args; |
733 args.off_the_record = nacl_host_message_filter_->off_the_record(); | 732 args.off_the_record = nacl_host_message_filter_->off_the_record(); |
734 args.permissions = permissions_; | 733 args.permissions = permissions_; |
735 CommandLine* cmdline = CommandLine::ForCurrentProcess(); | 734 CommandLine* cmdline = CommandLine::ForCurrentProcess(); |
736 DCHECK(cmdline); | 735 DCHECK(cmdline); |
737 std::string flag_whitelist[] = {switches::kV, switches::kVModule}; | 736 std::string flag_whitelist[] = {switches::kV, switches::kVModule}; |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
945 } else { | 944 } else { |
946 NaClStartDebugExceptionHandlerThread( | 945 NaClStartDebugExceptionHandlerThread( |
947 process_handle.Take(), info, | 946 process_handle.Take(), info, |
948 base::MessageLoopProxy::current(), | 947 base::MessageLoopProxy::current(), |
949 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, | 948 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, |
950 weak_factory_.GetWeakPtr())); | 949 weak_factory_.GetWeakPtr())); |
951 return true; | 950 return true; |
952 } | 951 } |
953 } | 952 } |
954 #endif | 953 #endif |
OLD | NEW |