OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "services/shell/runner/host/child_process_host.h" | 5 #include "services/service_manager/runner/host/child_process_host.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
11 #include "base/bind.h" | 11 #include "base/bind.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/location.h" | 13 #include "base/location.h" |
14 #include "base/logging.h" | 14 #include "base/logging.h" |
15 #include "base/macros.h" | 15 #include "base/macros.h" |
16 #include "base/message_loop/message_loop.h" | 16 #include "base/message_loop/message_loop.h" |
17 #include "base/process/kill.h" | 17 #include "base/process/kill.h" |
18 #include "base/process/launch.h" | 18 #include "base/process/launch.h" |
19 #include "base/synchronization/lock.h" | 19 #include "base/synchronization/lock.h" |
20 #include "base/task_runner.h" | 20 #include "base/task_runner.h" |
21 #include "base/threading/thread_task_runner_handle.h" | 21 #include "base/threading/thread_task_runner_handle.h" |
22 #include "mojo/edk/embedder/embedder.h" | 22 #include "mojo/edk/embedder/embedder.h" |
23 #include "mojo/public/cpp/bindings/interface_ptr_info.h" | 23 #include "mojo/public/cpp/bindings/interface_ptr_info.h" |
24 #include "mojo/public/cpp/system/core.h" | 24 #include "mojo/public/cpp/system/core.h" |
25 #include "services/shell/native_runner_delegate.h" | 25 #include "services/service_manager/native_runner_delegate.h" |
26 #include "services/shell/runner/common/client_util.h" | 26 #include "services/service_manager/runner/common/client_util.h" |
27 #include "services/shell/runner/common/switches.h" | 27 #include "services/service_manager/runner/common/switches.h" |
28 | 28 |
29 #if defined(OS_LINUX) | 29 #if defined(OS_LINUX) |
30 #include "sandbox/linux/services/namespace_sandbox.h" | 30 #include "sandbox/linux/services/namespace_sandbox.h" |
31 #endif | 31 #endif |
32 | 32 |
33 #if defined(OS_WIN) | 33 #if defined(OS_WIN) |
34 #include "base/win/windows_version.h" | 34 #include "base/win/windows_version.h" |
35 #endif | 35 #endif |
36 | 36 |
37 #if defined(OS_MACOSX) | 37 #if defined(OS_MACOSX) |
38 #include "services/shell/runner/host/mach_broker.h" | 38 #include "services/service_manager/runner/host/mach_broker.h" |
39 #endif | 39 #endif |
40 | 40 |
41 namespace shell { | 41 namespace shell { |
42 | 42 |
43 ChildProcessHost::ChildProcessHost(base::TaskRunner* launch_process_runner, | 43 ChildProcessHost::ChildProcessHost(base::TaskRunner* launch_process_runner, |
44 NativeRunnerDelegate* delegate, | 44 NativeRunnerDelegate* delegate, |
45 bool start_sandboxed, | 45 bool start_sandboxed, |
46 const Identity& target, | 46 const Identity& target, |
47 const base::FilePath& app_path) | 47 const base::FilePath& app_path) |
48 : launch_process_runner_(launch_process_runner), | 48 : launch_process_runner_(launch_process_runner), |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
210 child_process_.Handle(), | 210 child_process_.Handle(), |
211 mojo::edk::ScopedPlatformHandle(mojo::edk::PlatformHandle( | 211 mojo::edk::ScopedPlatformHandle(mojo::edk::PlatformHandle( |
212 mojo_ipc_channel_->PassServerHandle().release().handle)), | 212 mojo_ipc_channel_->PassServerHandle().release().handle)), |
213 child_token_); | 213 child_token_); |
214 } | 214 } |
215 } | 215 } |
216 start_child_process_event_.Signal(); | 216 start_child_process_event_.Signal(); |
217 } | 217 } |
218 | 218 |
219 } // namespace shell | 219 } // namespace shell |
OLD | NEW |