| 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 "components/nacl/browser/nacl_broker_host_win.h" | 5 #include "components/nacl/browser/nacl_broker_host_win.h" |
| 6 | 6 |
| 7 #include "base/base_switches.h" | 7 #include "base/base_switches.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "components/nacl/browser/nacl_broker_service_win.h" | 9 #include "components/nacl/browser/nacl_broker_service_win.h" |
| 10 #include "components/nacl/browser/nacl_browser.h" | 10 #include "components/nacl/browser/nacl_browser.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 // Create the channel that will be used for communicating with the broker. | 50 // Create the channel that will be used for communicating with the broker. |
| 51 std::string channel_id = process_->GetHost()->CreateChannel(); | 51 std::string channel_id = process_->GetHost()->CreateChannel(); |
| 52 if (channel_id.empty()) | 52 if (channel_id.empty()) |
| 53 return false; | 53 return false; |
| 54 | 54 |
| 55 // Create the path to the nacl broker/loader executable. | 55 // Create the path to the nacl broker/loader executable. |
| 56 base::FilePath nacl_path; | 56 base::FilePath nacl_path; |
| 57 if (!NaClBrowser::GetInstance()->GetNaCl64ExePath(&nacl_path)) | 57 if (!NaClBrowser::GetInstance()->GetNaCl64ExePath(&nacl_path)) |
| 58 return false; | 58 return false; |
| 59 | 59 |
| 60 CommandLine* cmd_line = new CommandLine(nacl_path); | 60 base::CommandLine* cmd_line = new base::CommandLine(nacl_path); |
| 61 CopyNaClCommandLineArguments(cmd_line); | 61 CopyNaClCommandLineArguments(cmd_line); |
| 62 | 62 |
| 63 cmd_line->AppendSwitchASCII(switches::kProcessType, | 63 cmd_line->AppendSwitchASCII(switches::kProcessType, |
| 64 switches::kNaClBrokerProcess); | 64 switches::kNaClBrokerProcess); |
| 65 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id); | 65 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id); |
| 66 if (NaClBrowser::GetDelegate()->DialogsAreSuppressed()) | 66 if (NaClBrowser::GetDelegate()->DialogsAreSuppressed()) |
| 67 cmd_line->AppendSwitch(switches::kNoErrorDialogs); | 67 cmd_line->AppendSwitch(switches::kNoErrorDialogs); |
| 68 | 68 |
| 69 process_->Launch(new NaClBrokerSandboxedProcessLauncherDelegate, | 69 process_->Launch(new NaClBrokerSandboxedProcessLauncherDelegate, |
| 70 cmd_line); | 70 cmd_line); |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 NaClBrokerService::GetInstance()->OnDebugExceptionHandlerLaunched(pid, | 109 NaClBrokerService::GetInstance()->OnDebugExceptionHandlerLaunched(pid, |
| 110 success); | 110 success); |
| 111 } | 111 } |
| 112 | 112 |
| 113 void NaClBrokerHost::StopBroker() { | 113 void NaClBrokerHost::StopBroker() { |
| 114 is_terminating_ = true; | 114 is_terminating_ = true; |
| 115 process_->Send(new NaClProcessMsg_StopBroker()); | 115 process_->Send(new NaClProcessMsg_StopBroker()); |
| 116 } | 116 } |
| 117 | 117 |
| 118 } // namespace nacl | 118 } // namespace nacl |
| OLD | NEW |