| 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 "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "components/nacl/browser/nacl_broker_service_win.h" | 10 #include "components/nacl/browser/nacl_broker_service_win.h" |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 | 60 |
| 61 CommandLine* cmd_line = new CommandLine(nacl_path); | 61 CommandLine* cmd_line = new CommandLine(nacl_path); |
| 62 CopyNaClCommandLineArguments(cmd_line); | 62 CopyNaClCommandLineArguments(cmd_line); |
| 63 | 63 |
| 64 cmd_line->AppendSwitchASCII(switches::kProcessType, | 64 cmd_line->AppendSwitchASCII(switches::kProcessType, |
| 65 switches::kNaClBrokerProcess); | 65 switches::kNaClBrokerProcess); |
| 66 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id); | 66 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id); |
| 67 if (NaClBrowser::GetDelegate()->DialogsAreSuppressed()) | 67 if (NaClBrowser::GetDelegate()->DialogsAreSuppressed()) |
| 68 cmd_line->AppendSwitch(switches::kNoErrorDialogs); | 68 cmd_line->AppendSwitch(switches::kNoErrorDialogs); |
| 69 | 69 |
| 70 process_->Launch(new NaClBrokerSandboxedProcessLauncherDelegate, cmd_line); | 70 process_->Launch(new NaClBrokerSandboxedProcessLauncherDelegate, |
| 71 false, |
| 72 cmd_line); |
| 71 return true; | 73 return true; |
| 72 } | 74 } |
| 73 | 75 |
| 74 bool NaClBrokerHost::OnMessageReceived(const IPC::Message& msg) { | 76 bool NaClBrokerHost::OnMessageReceived(const IPC::Message& msg) { |
| 75 bool handled = true; | 77 bool handled = true; |
| 76 IPC_BEGIN_MESSAGE_MAP(NaClBrokerHost, msg) | 78 IPC_BEGIN_MESSAGE_MAP(NaClBrokerHost, msg) |
| 77 IPC_MESSAGE_HANDLER(NaClProcessMsg_LoaderLaunched, OnLoaderLaunched) | 79 IPC_MESSAGE_HANDLER(NaClProcessMsg_LoaderLaunched, OnLoaderLaunched) |
| 78 IPC_MESSAGE_HANDLER(NaClProcessMsg_DebugExceptionHandlerLaunched, | 80 IPC_MESSAGE_HANDLER(NaClProcessMsg_DebugExceptionHandlerLaunched, |
| 79 OnDebugExceptionHandlerLaunched) | 81 OnDebugExceptionHandlerLaunched) |
| 80 IPC_MESSAGE_UNHANDLED(handled = false) | 82 IPC_MESSAGE_UNHANDLED(handled = false) |
| (...skipping 28 matching lines...) Expand all Loading... |
| 109 NaClBrokerService::GetInstance()->OnDebugExceptionHandlerLaunched(pid, | 111 NaClBrokerService::GetInstance()->OnDebugExceptionHandlerLaunched(pid, |
| 110 success); | 112 success); |
| 111 } | 113 } |
| 112 | 114 |
| 113 void NaClBrokerHost::StopBroker() { | 115 void NaClBrokerHost::StopBroker() { |
| 114 is_terminating_ = true; | 116 is_terminating_ = true; |
| 115 process_->Send(new NaClProcessMsg_StopBroker()); | 117 process_->Send(new NaClProcessMsg_StopBroker()); |
| 116 } | 118 } |
| 117 | 119 |
| 118 } // namespace nacl | 120 } // namespace nacl |
| OLD | NEW |