| 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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 : client_(NULL), | 158 : client_(NULL), |
| 159 client_thread_id_(BrowserThread::UI), | 159 client_thread_id_(BrowserThread::UI), |
| 160 termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION), | 160 termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION), |
| 161 exit_code_(RESULT_CODE_NORMAL_EXIT), | 161 exit_code_(RESULT_CODE_NORMAL_EXIT), |
| 162 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) | 162 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) |
| 163 zygote_(false), | 163 zygote_(false), |
| 164 #endif | 164 #endif |
| 165 starting_(true), | 165 starting_(true), |
| 166 // TODO(earthdok): Re-enable on CrOS http://crbug.com/360622 | 166 // TODO(earthdok): Re-enable on CrOS http://crbug.com/360622 |
| 167 #if (defined(ADDRESS_SANITIZER) || defined(LEAK_SANITIZER) || \ | 167 #if (defined(ADDRESS_SANITIZER) || defined(LEAK_SANITIZER) || \ |
| 168 defined(THREAD_SANITIZER)) && !defined(OS_CHROMEOS) | 168 defined(MEMORY_SANITIZER) || defined(THREAD_SANITIZER) || \ |
| 169 defined(UNDEFINED_SANITIZER)) && !defined(OS_CHROMEOS) |
| 169 terminate_child_on_shutdown_(false) { | 170 terminate_child_on_shutdown_(false) { |
| 170 #else | 171 #else |
| 171 terminate_child_on_shutdown_(true) { | 172 terminate_child_on_shutdown_(true) { |
| 172 #endif | 173 #endif |
| 173 } | 174 } |
| 174 | 175 |
| 175 void ChildProcessLauncher::Context::Launch( | 176 void ChildProcessLauncher::Context::Launch( |
| 176 SandboxedProcessLauncherDelegate* delegate, | 177 SandboxedProcessLauncherDelegate* delegate, |
| 177 base::CommandLine* cmd_line, | 178 base::CommandLine* cmd_line, |
| 178 int child_process_id, | 179 int child_process_id, |
| (...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 603 context_->SetProcessBackgrounded(background); | 604 context_->SetProcessBackgrounded(background); |
| 604 } | 605 } |
| 605 | 606 |
| 606 void ChildProcessLauncher::SetTerminateChildOnShutdown( | 607 void ChildProcessLauncher::SetTerminateChildOnShutdown( |
| 607 bool terminate_on_shutdown) { | 608 bool terminate_on_shutdown) { |
| 608 if (context_.get()) | 609 if (context_.get()) |
| 609 context_->set_terminate_child_on_shutdown(terminate_on_shutdown); | 610 context_->set_terminate_child_on_shutdown(terminate_on_shutdown); |
| 610 } | 611 } |
| 611 | 612 |
| 612 } // namespace content | 613 } // namespace content |
| OLD | NEW |