summaryrefslogtreecommitdiffstats
path: root/content/browser/child_process_launcher.cc
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser/child_process_launcher.cc')
-rw-r--r--content/browser/child_process_launcher.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc
index cb7d031..759ddad 100644
--- a/content/browser/child_process_launcher.cc
+++ b/content/browser/child_process_launcher.cc
@@ -48,12 +48,17 @@ class ChildProcessLauncher::Context
client_thread_id_(BrowserThread::UI),
termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION),
exit_code_(content::RESULT_CODE_NORMAL_EXIT),
- starting_(true),
- terminate_child_on_shutdown_(true)
+ starting_(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::kRendererCleanExit);
+#else
+ terminate_child_on_shutdown_ = true;
+#endif
}
void Launch(