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

Unified Diff: content/browser/child_process_launcher.cc

Issue 1164483003: Allow startup with missing V8 snapshot file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Feedback from sky Created 5 years, 6 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/app/content_main_runner.cc ('k') | content/public/browser/content_browser_client.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 28be72bb9c32eb853702adbdb0726379a3f9825c..5985a9e5ce5821a8d4803cc8cd43d9cc3e19d850 100644
--- a/content/browser/child_process_launcher.cc
+++ b/content/browser/child_process_launcher.cc
@@ -148,6 +148,8 @@ void LaunchOnLauncherThread(const NotifyCallback& callback,
GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess(
*cmd_line, child_process_id, files_to_register.get());
+ GetContentClient()->browser()->AppendMappedFileCommandLineSwitches(cmd_line);
+
StartChildProcess(
cmd_line->argv(), child_process_id, files_to_register.Pass(),
base::Bind(&OnChildProcessStartedAndroid, callback, client_thread_id,
@@ -160,6 +162,9 @@ void LaunchOnLauncherThread(const NotifyCallback& callback,
#if !defined(OS_MACOSX)
GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess(
*cmd_line, child_process_id, files_to_register.get());
+
+ GetContentClient()->browser()->AppendMappedFileCommandLineSwitches(cmd_line);
rmcilroy 2015/06/05 13:24:51 nit - there is another call to GetAdditionalMapped
Erik Corry Chromium.org 2015/06/08 13:31:03 In the end I didn't do this becasue the command li
rmcilroy 2015/06/08 17:26:12 Ahh well, if it works I guess this is fine.
+
if (use_zygote) {
base::ProcessHandle handle = ZygoteHostImpl::GetInstance()->ForkRequest(
cmd_line->argv(), files_to_register.Pass(), process_type);
« no previous file with comments | « content/app/content_main_runner.cc ('k') | content/public/browser/content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698