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 "content/browser/child_process_launcher.h" | 5 #include "content/browser/child_process_launcher.h" |
6 | 6 |
7 #include <utility> // For std::pair. | 7 #include <utility> // For std::pair. |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 | 228 |
229 #if defined(OS_ANDROID) | 229 #if defined(OS_ANDROID) |
230 // Android WebView runs in single process, ensure that we never get here | 230 // Android WebView runs in single process, ensure that we never get here |
231 // when running in single process mode. | 231 // when running in single process mode. |
232 CHECK(!cmd_line->HasSwitch(switches::kSingleProcess)); | 232 CHECK(!cmd_line->HasSwitch(switches::kSingleProcess)); |
233 | 233 |
234 GetContentClient()->browser()-> | 234 GetContentClient()->browser()-> |
235 GetAdditionalMappedFilesForChildProcess(*cmd_line, child_process_id, | 235 GetAdditionalMappedFilesForChildProcess(*cmd_line, child_process_id, |
236 &files_to_register); | 236 &files_to_register); |
237 | 237 |
238 StartChildProcess(cmd_line->argv(), files_to_register, | 238 StartChildProcess(cmd_line->argv(), child_process_id, files_to_register, |
239 base::Bind(&ChildProcessLauncher::Context::OnChildProcessStarted, | 239 base::Bind(&ChildProcessLauncher::Context::OnChildProcessStarted, |
240 this_object, client_thread_id, begin_launch_time)); | 240 this_object, client_thread_id, begin_launch_time)); |
241 | 241 |
242 #elif defined(OS_POSIX) | 242 #elif defined(OS_POSIX) |
243 base::ProcessHandle handle = base::kNullProcessHandle; | 243 base::ProcessHandle handle = base::kNullProcessHandle; |
244 // We need to close the client end of the IPC channel to reliably detect | 244 // We need to close the client end of the IPC channel to reliably detect |
245 // child termination. | 245 // child termination. |
246 file_util::ScopedFD ipcfd_closer(&ipcfd); | 246 file_util::ScopedFD ipcfd_closer(&ipcfd); |
247 | 247 |
248 #if !defined(OS_MACOSX) | 248 #if !defined(OS_MACOSX) |
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
528 GetHandle(), background)); | 528 GetHandle(), background)); |
529 } | 529 } |
530 | 530 |
531 void ChildProcessLauncher::SetTerminateChildOnShutdown( | 531 void ChildProcessLauncher::SetTerminateChildOnShutdown( |
532 bool terminate_on_shutdown) { | 532 bool terminate_on_shutdown) { |
533 if (context_.get()) | 533 if (context_.get()) |
534 context_->set_terminate_child_on_shutdown(terminate_on_shutdown); | 534 context_->set_terminate_child_on_shutdown(terminate_on_shutdown); |
535 } | 535 } |
536 | 536 |
537 } // namespace content | 537 } // namespace content |
OLD | NEW |