Index: content/browser/child_process_launcher.cc |
=================================================================== |
--- content/browser/child_process_launcher.cc (revision 260245) |
+++ content/browser/child_process_launcher.cc (working copy) |
@@ -58,17 +58,12 @@ |
client_thread_id_(BrowserThread::UI), |
termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION), |
exit_code_(RESULT_CODE_NORMAL_EXIT), |
- starting_(true) |
+ starting_(true), |
+ terminate_child_on_shutdown_(true) |
#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) |
, zygote_(false) |
#endif |
{ |
-#if defined(OS_POSIX) |
- terminate_child_on_shutdown_ = !CommandLine::ForCurrentProcess()-> |
- HasSwitch(switches::kChildCleanExit); |
-#else |
- terminate_child_on_shutdown_ = true; |
-#endif |
} |
void Launch( |
@@ -499,7 +494,7 @@ |
} |
void ChildProcessLauncher::SetTerminateChildOnShutdown( |
- bool terminate_on_shutdown) { |
+ bool terminate_on_shutdown) { |
if (context_.get()) |
context_->set_terminate_child_on_shutdown(terminate_on_shutdown); |
} |