OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/broker/nacl_broker_listener.h" | 5 #include "components/nacl/broker/nacl_broker_listener.h" |
6 | 6 |
7 #include "base/base_switches.h" | 7 #include "base/base_switches.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
11 #include "base/message_loop/message_loop_proxy.h" | |
12 #include "base/path_service.h" | 11 #include "base/path_service.h" |
13 #include "base/process/process.h" | 12 #include "base/process/process.h" |
14 #include "base/process/process_handle.h" | 13 #include "base/process/process_handle.h" |
| 14 #include "base/thread_task_runner_handle.h" |
15 #include "components/nacl/common/nacl_cmd_line.h" | 15 #include "components/nacl/common/nacl_cmd_line.h" |
16 #include "components/nacl/common/nacl_debug_exception_handler_win.h" | 16 #include "components/nacl/common/nacl_debug_exception_handler_win.h" |
17 #include "components/nacl/common/nacl_messages.h" | 17 #include "components/nacl/common/nacl_messages.h" |
18 #include "components/nacl/common/nacl_switches.h" | 18 #include "components/nacl/common/nacl_switches.h" |
19 #include "content/public/common/content_switches.h" | 19 #include "content/public/common/content_switches.h" |
20 #include "content/public/common/sandbox_init.h" | 20 #include "content/public/common/sandbox_init.h" |
21 #include "ipc/ipc_channel.h" | 21 #include "ipc/ipc_channel.h" |
22 #include "ipc/ipc_switches.h" | 22 #include "ipc/ipc_switches.h" |
23 #include "sandbox/win/src/sandbox_policy.h" | 23 #include "sandbox/win/src/sandbox_policy.h" |
24 | 24 |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 } | 121 } |
122 channel_->Send(new NaClProcessMsg_LoaderLaunched(loader_channel_id, | 122 channel_->Send(new NaClProcessMsg_LoaderLaunched(loader_channel_id, |
123 loader_handle_in_browser)); | 123 loader_handle_in_browser)); |
124 } | 124 } |
125 | 125 |
126 void NaClBrokerListener::OnLaunchDebugExceptionHandler( | 126 void NaClBrokerListener::OnLaunchDebugExceptionHandler( |
127 int32 pid, base::ProcessHandle process_handle, | 127 int32 pid, base::ProcessHandle process_handle, |
128 const std::string& startup_info) { | 128 const std::string& startup_info) { |
129 NaClStartDebugExceptionHandlerThread( | 129 NaClStartDebugExceptionHandlerThread( |
130 base::Process(process_handle), startup_info, | 130 base::Process(process_handle), startup_info, |
131 base::MessageLoopProxy::current(), | 131 base::ThreadTaskRunnerHandle::Get(), |
132 base::Bind(SendReply, channel_.get(), pid)); | 132 base::Bind(SendReply, channel_.get(), pid)); |
133 } | 133 } |
134 | 134 |
135 void NaClBrokerListener::OnStopBroker() { | 135 void NaClBrokerListener::OnStopBroker() { |
136 base::MessageLoop::current()->Quit(); | 136 base::MessageLoop::current()->Quit(); |
137 } | 137 } |
OLD | NEW |