chrome/app/chrome_main_delegate.cc - Issue 402603006: [android_webview] Do not extract webviewchromium.pak

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: chrome/app/chrome_main_delegate.cc

Issue 402603006: [android_webview] Do not extract webviewchromium.pak (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@awassets

Patch Set: Use only InitSharedInstanceWithPakFileRegion and + rebase Created 6 years, 5 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: chrome/app/chrome_main_delegate.cc

diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc

index a2be6f10b0020615b0ecfe8e342827029da54c0b..3f30351a5c399c264766be82039414311fefeb0f 100644

--- a/chrome/app/chrome_main_delegate.cc

+++ b/chrome/app/chrome_main_delegate.cc

@@ -723,8 +723,10 @@ void ChromeMainDelegate::PreSandboxStartup() {

int locale_pak_fd = base::GlobalDescriptors::GetInstance()->MaybeGet(

kAndroidLocalePakDescriptor);

CHECK(locale_pak_fd != -1);

- ResourceBundle::InitSharedInstanceWithPakFile(base::File(locale_pak_fd),

- false);

+ ResourceBundle::InitSharedInstanceWithPakFileRegion(

+ base::File(locale_pak_fd),

+ base::MemoryMappedFile::Region::kWholeFile,

+ false);

int extra_pak_keys[] = {

kAndroidChrome100PercentPakDescriptor,

« no previous file with comments | « build/java_apk.gypi ('k') | content/shell/app/shell_main_delegate.cc » ('j') | no next file with comments »