Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(386)

Unified Diff: content/browser/child_process_launcher.cc

Issue 9936002: Added code so renderer would cleanly exit. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Added ifdef around alarm(30). Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/child_process_launcher.cc
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc
index cb7d0315dce12fe3ac9acfad0800e833a78ae163..759ddadccd56ea7a431d0d41f7fc1c6e17626b53 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(
« no previous file with comments | « chrome/test/functional/test_clean_exit.py ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698