content/browser/child_process_launcher.cc - Issue 1181953002: Load non-locale .pak files directly from the .apk on Android (rather than extracting on start-up).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/child_process_launcher.cc

Issue 1181953002: Load non-locale .pak files directly from the .apk on Android (rather than extracting on start-up). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@raw-paks

Patch Set: Fix content_browsertests 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/browser/battery_status/battery_monitor_integration_browsertest.cc ('k') | content/public/browser/content_browser_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 4f8e19095b0dc3cc1db7d1dcd83abc01d3dc86af..0abbc60cc3b654fba90ea5fe8f7c2051d55768e1 100644

--- a/content/browser/child_process_launcher.cc

+++ b/content/browser/child_process_launcher.cc

@@ -146,7 +146,11 @@ void LaunchOnLauncherThread(const NotifyCallback& callback,

#if defined(OS_POSIX) && !defined(OS_MACOSX)

std::map<int, base::MemoryMappedFile::Region> regions;

GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess(

- *cmd_line, child_process_id, files_to_register.get());

+ *cmd_line, child_process_id, files_to_register.get()

+#if defined(OS_ANDROID)

+ , &regions

+#endif

+ );

#if defined(V8_USE_EXTERNAL_STARTUP_DATA)

base::PlatformFile natives_pf =

gin::V8Initializer::GetOpenNativesFileForChildProcesses(