content/shell/browser/shell_content_browser_client.h - 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/shell/browser/shell_content_browser_client.h

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 unused LoadMainAndroidPackFile 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

« content/shell/app/shell_main_delegate.cc ('K') | « content/shell/app/shell_main_delegate.cc ('k') | content/shell/browser/shell_content_browser_client.cc » ('j') | ui/base/resource/resource_bundle_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/browser/shell_content_browser_client.h

diff --git a/content/shell/browser/shell_content_browser_client.h b/content/shell/browser/shell_content_browser_client.h

index 0568691ae3550b24623a6ce9c40a7bbd40ad992d..760a83a46c795e73983a55b64f1e54f01e39dd31 100644

--- a/content/shell/browser/shell_content_browser_client.h

+++ b/content/shell/browser/shell_content_browser_client.h

@@ -75,8 +75,12 @@ class ShellContentBrowserClient : public ContentBrowserClient {

void GetAdditionalMappedFilesForChildProcess(

const base::CommandLine& command_line,

int child_process_id,

- FileDescriptorInfo* mappings) override;

+ content::FileDescriptorInfo* mappings

+#if defined(OS_ANDROID)

+ , std::map<int, base::MemoryMappedFile::Region>* regions

#endif

+ ) override;

+#endif // defined(OS_POSIX) && !defined(OS_MACOSX)

#if defined(OS_WIN)

void PreSpawnRenderer(sandbox::TargetPolicy* policy, bool* success) override;

#endif