content/public/browser/content_browser_client.h - Issue 1147213004: Store and load icudtl.dat directly from the apk 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 1147213004: Store and load icudtl.dat directly from the apk rather than extracting on start-up (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@load-from-apk

Patch Set: CHECK(fd > 0) -> CHECK_GE(fd, 0) Created 5 years, 7 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

« chrome/browser/chrome_content_browser_client.cc ('K') | « 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 eff374d1c72f409e37044a2475f8b31bc7bdbca1..0a80b48298234ccbc30f8cd9c6b7509dc4ae48b8 100644

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

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

@@ -610,7 +610,12 @@ class CONTENT_EXPORT ContentBrowserClient {

virtual void GetAdditionalMappedFilesForChildProcess(

const base::CommandLine& command_line,

int child_process_id,

- FileDescriptorInfo* mappings) {}

+ FileDescriptorInfo* mappings

+#if defined(OS_ANDROID)

+ ,

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

jam 2015/06/04 03:13:30 nit: why not just combine these two lines together

agrieve 2015/06/04 19:17:20 I didn't know how to format it, so I let clang-for

+#endif

+ ) {}

#endif

#if defined(OS_WIN)