| 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 776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 787 IPC::Channel::MODE_CLIENT, | 787 IPC::Channel::MODE_CLIENT, |
| 788 &ipc_plugin_listener_, | 788 &ipc_plugin_listener_, |
| 789 base::MessageLoopProxy::current().get())); | 789 base::MessageLoopProxy::current().get())); |
| 790 // Create the browser ppapi host and enable PPAPI message dispatching to the | 790 // Create the browser ppapi host and enable PPAPI message dispatching to the |
| 791 // browser process. | 791 // browser process. |
| 792 ppapi_host_.reset(content::BrowserPpapiHost::CreateExternalPluginProcess( | 792 ppapi_host_.reset(content::BrowserPpapiHost::CreateExternalPluginProcess( |
| 793 ipc_proxy_channel_.get(), // sender | 793 ipc_proxy_channel_.get(), // sender |
| 794 permissions_, | 794 permissions_, |
| 795 process_->GetData().handle, | 795 process_->GetData().handle, |
| 796 ipc_proxy_channel_.get(), | 796 ipc_proxy_channel_.get(), |
| 797 nacl_host_message_filter_->GetHostResolver(), | |
| 798 nacl_host_message_filter_->render_process_id(), | 797 nacl_host_message_filter_->render_process_id(), |
| 799 render_view_id_, | 798 render_view_id_, |
| 800 profile_directory_)); | 799 profile_directory_)); |
| 801 | 800 |
| 802 ppapi::PpapiNaClChannelArgs args; | 801 ppapi::PpapiNaClChannelArgs args; |
| 803 args.off_the_record = nacl_host_message_filter_->off_the_record(); | 802 args.off_the_record = nacl_host_message_filter_->off_the_record(); |
| 804 args.permissions = permissions_; | 803 args.permissions = permissions_; |
| 805 CommandLine* cmdline = CommandLine::ForCurrentProcess(); | 804 CommandLine* cmdline = CommandLine::ForCurrentProcess(); |
| 806 DCHECK(cmdline); | 805 DCHECK(cmdline); |
| 807 std::string flag_whitelist[] = {switches::kV, switches::kVModule}; | 806 std::string flag_whitelist[] = {switches::kV, switches::kVModule}; |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1015 } else { | 1014 } else { |
| 1016 NaClStartDebugExceptionHandlerThread( | 1015 NaClStartDebugExceptionHandlerThread( |
| 1017 process_handle.Take(), info, | 1016 process_handle.Take(), info, |
| 1018 base::MessageLoopProxy::current(), | 1017 base::MessageLoopProxy::current(), |
| 1019 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, | 1018 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, |
| 1020 weak_factory_.GetWeakPtr())); | 1019 weak_factory_.GetWeakPtr())); |
| 1021 return true; | 1020 return true; |
| 1022 } | 1021 } |
| 1023 } | 1022 } |
| 1024 #endif | 1023 #endif |
| OLD | NEW |