chromecast/browser/cast_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: chromecast/browser/cast_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

« chrome/app/chrome_main_delegate.cc ('K') | « chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastApplication.java ('k') | chromecast/browser/cast_content_browser_client.cc » ('j') | components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsApplication.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromecast/browser/cast_content_browser_client.h

diff --git a/chromecast/browser/cast_content_browser_client.h b/chromecast/browser/cast_content_browser_client.h

index 942a4c0194e5c8544c20007fa47bac4cdfdb6d28..1c4b8248353b308aeb0dd8c1b9ee0103522d8b64 100644

--- a/chromecast/browser/cast_content_browser_client.h

+++ b/chromecast/browser/cast_content_browser_client.h

@@ -119,7 +119,11 @@ class CastContentBrowserClient: public content::ContentBrowserClient {

void GetAdditionalMappedFilesForChildProcess(

const base::CommandLine& command_line,

int child_process_id,

- content::FileDescriptorInfo* mappings) override;

+ FileDescriptorInfo* mappings

+#if defined(OS_ANDROID)

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

+#endif

+ ) override;

#if defined(OS_ANDROID) && defined(VIDEO_HOLE)

content::ExternalVideoSurfaceContainer*

OverrideCreateExternalVideoSurfaceContainer(