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

Unified Diff: content/browser/child_process_launcher.cc

Issue 2384163002: Add a --no-zygote command line flag (Closed)
Patch Set: Better error message Created 4 years, 2 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
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/child_process_launcher.cc
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc
index 5a655368aa8bac219446a3ea3586a4c7b6eb7666..0d640fae6ab95d3e10951a73f1b615b1a849df03 100644
--- a/content/browser/child_process_launcher.cc
+++ b/content/browser/child_process_launcher.cc
@@ -259,7 +259,10 @@ void LaunchOnLauncherThread(const NotifyCallback& callback,
// child termination.
#if !defined(OS_MACOSX)
- ZygoteHandle* zygote_handle = delegate->GetZygote();
+ ZygoteHandle* zygote_handle =
+ !base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote)
+ ? delegate->GetZygote()
+ : nullptr;
// If |zygote_handle| is null, a zygote should not be used.
if (zygote_handle) {
// This code runs on the PROCESS_LAUNCHER thread so race conditions are not
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698