| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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_broker_host_win.h" | 5 #include "chrome/browser/nacl_host/nacl_broker_host_win.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "ipc/ipc_switches.h" | 9 #include "ipc/ipc_switches.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 | 37 |
| 38 // Create the path to the nacl broker/loader executable. | 38 // Create the path to the nacl broker/loader executable. |
| 39 FilePath module_path; | 39 FilePath module_path; |
| 40 if (!PathService::Get(base::FILE_MODULE, &module_path)) | 40 if (!PathService::Get(base::FILE_MODULE, &module_path)) |
| 41 return false; | 41 return false; |
| 42 | 42 |
| 43 FilePath nacl_path = module_path.DirName().Append(chrome::kNaClAppName); | 43 FilePath nacl_path = module_path.DirName().Append(chrome::kNaClAppName); |
| 44 CommandLine* cmd_line = new CommandLine(nacl_path); | 44 CommandLine* cmd_line = new CommandLine(nacl_path); |
| 45 nacl::CopyNaClCommandLineArguments(cmd_line); | 45 nacl::CopyNaClCommandLineArguments(cmd_line); |
| 46 | 46 |
| 47 cmd_line->AppendSwitchWithValue(switches::kProcessType, | 47 cmd_line->AppendSwitchASCII(switches::kProcessType, |
| 48 switches::kNaClBrokerProcess); | 48 switches::kNaClBrokerProcess); |
| 49 | 49 |
| 50 cmd_line->AppendSwitchWithValue(switches::kProcessChannelID, channel_id()); | 50 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id()); |
| 51 | 51 |
| 52 BrowserChildProcessHost::Launch(FilePath(), cmd_line); | 52 BrowserChildProcessHost::Launch(FilePath(), cmd_line); |
| 53 return true; | 53 return true; |
| 54 } | 54 } |
| 55 | 55 |
| 56 void NaClBrokerHost::OnMessageReceived(const IPC::Message& msg) { | 56 void NaClBrokerHost::OnMessageReceived(const IPC::Message& msg) { |
| 57 IPC_BEGIN_MESSAGE_MAP(NaClBrokerHost, msg) | 57 IPC_BEGIN_MESSAGE_MAP(NaClBrokerHost, msg) |
| 58 IPC_MESSAGE_HANDLER(NaClProcessMsg_LoaderLaunched, OnLoaderLaunched) | 58 IPC_MESSAGE_HANDLER(NaClProcessMsg_LoaderLaunched, OnLoaderLaunched) |
| 59 IPC_END_MESSAGE_MAP() | 59 IPC_END_MESSAGE_MAP() |
| 60 } | 60 } |
| 61 | 61 |
| 62 bool NaClBrokerHost::LaunchLoader( | 62 bool NaClBrokerHost::LaunchLoader( |
| 63 const std::wstring& loader_channel_id) { | 63 const std::wstring& loader_channel_id) { |
| 64 return Send(new NaClProcessMsg_LaunchLoaderThroughBroker(loader_channel_id)); | 64 return Send(new NaClProcessMsg_LaunchLoaderThroughBroker(loader_channel_id)); |
| 65 } | 65 } |
| 66 | 66 |
| 67 void NaClBrokerHost::OnLoaderLaunched(const std::wstring& loader_channel_id, | 67 void NaClBrokerHost::OnLoaderLaunched(const std::wstring& loader_channel_id, |
| 68 base::ProcessHandle handle) { | 68 base::ProcessHandle handle) { |
| 69 NaClBrokerService::GetInstance()->OnLoaderLaunched(loader_channel_id, handle); | 69 NaClBrokerService::GetInstance()->OnLoaderLaunched(loader_channel_id, handle); |
| 70 } | 70 } |
| 71 | 71 |
| 72 void NaClBrokerHost::StopBroker() { | 72 void NaClBrokerHost::StopBroker() { |
| 73 stopping_ = true; | 73 stopping_ = true; |
| 74 Send(new NaClProcessMsg_StopBroker()); | 74 Send(new NaClProcessMsg_StopBroker()); |
| 75 } | 75 } |
| OLD | NEW |