content/public/browser/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/public/browser/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

« components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsApplication.java ('K') | « content/browser/child_process_launcher.cc ('k') | content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsApplication.java » ('j') | content/shell/app/shell_main_delegate.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/browser/content_browser_client.h

diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h

index acd568b8229eca7b029c32f74dc3576161eb8121..8765400a91aba211f16b9e220824ad3ac98b7b0a 100644

--- a/content/public/browser/content_browser_client.h

+++ b/content/public/browser/content_browser_client.h

@@ -622,8 +622,12 @@ class CONTENT_EXPORT ContentBrowserClient {

virtual void GetAdditionalMappedFilesForChildProcess(

const base::CommandLine& command_line,

int child_process_id,

- FileDescriptorInfo* mappings) {}

+ content::FileDescriptorInfo* mappings

+#if defined(OS_ANDROID)

jochen (gone - plz use gerrit) 2015/06/17 08:47:54 please ifdef the entire method, not just part of i

agrieve 2015/06/17 14:25:31 Done.

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

#endif

+ ) {};

Yaron 2015/06/17 14:12:28 remove ";"

agrieve 2015/06/17 14:35:40 Done.

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

#if defined(OS_WIN)

// Returns the name of the dll that contains cursors and other resources.