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: yfriedman review comments 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

« build/android/gyp/locale_pak_resources.py ('K') | « chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastApplication.java ('k') | chromecast/browser/cast_content_browser_client.cc » ('j') | ui/base/resource/resource_bundle_android.h » ('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..1db6ba38ae0e5c2ee248c7fe54dae63c7b7bdc19 100644

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

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

@@ -116,10 +116,18 @@ class CastContentBrowserClient: public content::ContentBrowserClient {

int opener_render_view_id,

int opener_render_frame_id,

bool* no_javascript_access) override;

+#if defined(OS_ANDROID)

+ void GetAdditionalMappedFilesForChildProcess(

+ const base::CommandLine& command_line,

+ int child_process_id,

+ content::FileDescriptorInfo* mappings,

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

+#else

void GetAdditionalMappedFilesForChildProcess(

const base::CommandLine& command_line,

int child_process_id,

content::FileDescriptorInfo* mappings) override;

+#endif // defined(OS_ANDROID)

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

content::ExternalVideoSurfaceContainer*

OverrideCreateExternalVideoSurfaceContainer(