| 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 "mojo/shell/runner/host/child_process_host.h" | 5 #include "mojo/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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 LOG(ERROR) << "Starting the process with a sandbox failed. Missing kernel" | 182 LOG(ERROR) << "Starting the process with a sandbox failed. Missing kernel" |
| 183 << " support."; | 183 << " support."; |
| 184 } | 184 } |
| 185 } else | 185 } else |
| 186 #endif | 186 #endif |
| 187 { | 187 { |
| 188 #if defined(OS_MACOSX) | 188 #if defined(OS_MACOSX) |
| 189 MachBroker* mach_broker = MachBroker::GetInstance(); | 189 MachBroker* mach_broker = MachBroker::GetInstance(); |
| 190 base::AutoLock locker(mach_broker->GetLock()); | 190 base::AutoLock locker(mach_broker->GetLock()); |
| 191 #endif | 191 #endif |
| 192 LOG(WARNING) << "PATH: " << app_path_.value(); |
| 192 child_process_ = base::LaunchProcess(*child_command_line, options); | 193 child_process_ = base::LaunchProcess(*child_command_line, options); |
| 193 #if defined(OS_MACOSX) | 194 #if defined(OS_MACOSX) |
| 194 mach_broker->ExpectPid(child_process_.Handle()); | 195 mach_broker->ExpectPid(child_process_.Handle()); |
| 195 #endif | 196 #endif |
| 196 } | 197 } |
| 197 | 198 |
| 198 if (child_process_.IsValid()) { | 199 if (child_process_.IsValid()) { |
| 199 if (mojo_ipc_channel_.get()) { | 200 if (mojo_ipc_channel_.get()) { |
| 200 mojo_ipc_channel_->ChildProcessLaunched(); | 201 mojo_ipc_channel_->ChildProcessLaunched(); |
| 201 mojo::edk::ChildProcessLaunched( | 202 mojo::edk::ChildProcessLaunched( |
| 202 child_process_.Handle(), | 203 child_process_.Handle(), |
| 203 mojo::edk::ScopedPlatformHandle(mojo::edk::PlatformHandle( | 204 mojo::edk::ScopedPlatformHandle(mojo::edk::PlatformHandle( |
| 204 mojo_ipc_channel_->PassServerHandle().release().handle))); | 205 mojo_ipc_channel_->PassServerHandle().release().handle))); |
| 205 } | 206 } |
| 206 } | 207 } |
| 207 start_child_process_event_.Signal(); | 208 start_child_process_event_.Signal(); |
| 208 } | 209 } |
| 209 | 210 |
| 210 } // namespace shell | 211 } // namespace shell |
| 211 } // namespace mojo | 212 } // namespace mojo |
| OLD | NEW |