| 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/shell/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 |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 192 MachBroker* mach_broker = MachBroker::GetInstance(); | 192 MachBroker* mach_broker = MachBroker::GetInstance(); |
| 193 base::AutoLock locker(mach_broker->GetLock()); | 193 base::AutoLock locker(mach_broker->GetLock()); |
| 194 #endif | 194 #endif |
| 195 child_process_ = base::LaunchProcess(*child_command_line, options); | 195 child_process_ = base::LaunchProcess(*child_command_line, options); |
| 196 #if defined(OS_MACOSX) | 196 #if defined(OS_MACOSX) |
| 197 mach_broker->ExpectPid(child_process_.Handle()); | 197 mach_broker->ExpectPid(child_process_.Handle()); |
| 198 #endif | 198 #endif |
| 199 } | 199 } |
| 200 | 200 |
| 201 if (child_process_.IsValid()) { | 201 if (child_process_.IsValid()) { |
| 202 DVLOG(0) << "Launched child process pid=" << child_process_.Pid() |
| 203 << ", instance=" << target_.instance() |
| 204 << ", name=" << target_.name() |
| 205 << ", user_id=" << target_.user_id(); |
| 206 |
| 202 if (mojo_ipc_channel_.get()) { | 207 if (mojo_ipc_channel_.get()) { |
| 203 mojo_ipc_channel_->ChildProcessLaunched(); | 208 mojo_ipc_channel_->ChildProcessLaunched(); |
| 204 mojo::edk::ChildProcessLaunched( | 209 mojo::edk::ChildProcessLaunched( |
| 205 child_process_.Handle(), | 210 child_process_.Handle(), |
| 206 mojo::edk::ScopedPlatformHandle(mojo::edk::PlatformHandle( | 211 mojo::edk::ScopedPlatformHandle(mojo::edk::PlatformHandle( |
| 207 mojo_ipc_channel_->PassServerHandle().release().handle)), | 212 mojo_ipc_channel_->PassServerHandle().release().handle)), |
| 208 child_token_); | 213 child_token_); |
| 209 } | 214 } |
| 210 } | 215 } |
| 211 start_child_process_event_.Signal(); | 216 start_child_process_event_.Signal(); |
| 212 } | 217 } |
| 213 | 218 |
| 214 } // namespace shell | 219 } // namespace shell |
| OLD | NEW |