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 727 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
738 IPC::Channel::MODE_CLIENT, | 738 IPC::Channel::MODE_CLIENT, |
739 &ipc_plugin_listener_, | 739 &ipc_plugin_listener_, |
740 base::MessageLoopProxy::current().get())); | 740 base::MessageLoopProxy::current().get())); |
741 // Create the browser ppapi host and enable PPAPI message dispatching to the | 741 // Create the browser ppapi host and enable PPAPI message dispatching to the |
742 // browser process. | 742 // browser process. |
743 ppapi_host_.reset(content::BrowserPpapiHost::CreateExternalPluginProcess( | 743 ppapi_host_.reset(content::BrowserPpapiHost::CreateExternalPluginProcess( |
744 ipc_proxy_channel_.get(), // sender | 744 ipc_proxy_channel_.get(), // sender |
745 permissions_, | 745 permissions_, |
746 process_->GetData().handle, | 746 process_->GetData().handle, |
747 ipc_proxy_channel_.get(), | 747 ipc_proxy_channel_.get(), |
748 nacl_host_message_filter_->GetHostResolver(), | |
749 nacl_host_message_filter_->render_process_id(), | 748 nacl_host_message_filter_->render_process_id(), |
750 render_view_id_, | 749 render_view_id_, |
751 profile_directory_)); | 750 profile_directory_)); |
752 | 751 |
753 ppapi::PpapiNaClChannelArgs args; | 752 ppapi::PpapiNaClChannelArgs args; |
754 args.off_the_record = nacl_host_message_filter_->off_the_record(); | 753 args.off_the_record = nacl_host_message_filter_->off_the_record(); |
755 args.permissions = permissions_; | 754 args.permissions = permissions_; |
756 CommandLine* cmdline = CommandLine::ForCurrentProcess(); | 755 CommandLine* cmdline = CommandLine::ForCurrentProcess(); |
757 DCHECK(cmdline); | 756 DCHECK(cmdline); |
758 std::string flag_whitelist[] = {switches::kV, switches::kVModule}; | 757 std::string flag_whitelist[] = {switches::kV, switches::kVModule}; |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
966 } else { | 965 } else { |
967 NaClStartDebugExceptionHandlerThread( | 966 NaClStartDebugExceptionHandlerThread( |
968 process_handle.Take(), info, | 967 process_handle.Take(), info, |
969 base::MessageLoopProxy::current(), | 968 base::MessageLoopProxy::current(), |
970 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, | 969 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, |
971 weak_factory_.GetWeakPtr())); | 970 weak_factory_.GetWeakPtr())); |
972 return true; | 971 return true; |
973 } | 972 } |
974 } | 973 } |
975 #endif | 974 #endif |
OLD | NEW |