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 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/child_process_launcher.cc ('k') | content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsApplication.java » ('j') | no next file with comments »
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..9d7e7a9d522c7b70ebae5c232453e3aecba28e18 100644

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

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

@@ -616,14 +616,20 @@ class CONTENT_EXPORT ContentBrowserClient {

// Allows the embedder to record |metric| for a specific |url|.

virtual void RecordURLMetric(const std::string& metric, const GURL& url) {}

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

// Populates |mappings| with all files that need to be mapped before launching

// a child process.

+#if defined(OS_ANDROID)

virtual void GetAdditionalMappedFilesForChildProcess(

const base::CommandLine& command_line,

int child_process_id,

- FileDescriptorInfo* mappings) {}

-#endif

+ content::FileDescriptorInfo* mappings,

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

+#elif defined(OS_POSIX) && !defined(OS_MACOSX)

+ virtual void GetAdditionalMappedFilesForChildProcess(

+ const base::CommandLine& command_line,

+ int child_process_id,

+ content::FileDescriptorInfo* mappings) {}

+#endif // defined(OS_ANDROID)

#if defined(OS_WIN)

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