diff options
| author | agrieve <agrieve@chromium.org> | 2015-06-24 11:59:00 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-24 19:00:09 +0000 |
| commit | 05398f5f735ac47b070f7c6897b4d25a1aae8ca9 (patch) | |
| tree | 88d79ba8c8f41fa5ed5256e61d2ae8f9a2a35f7e /chromecast/browser/cast_content_browser_client.h | |
| parent | c6ba34ab12ca44c339aeac39d558fd763415bb9f (diff) | |
| download | chromium_src-05398f5f735ac47b070f7c6897b4d25a1aae8ca9.zip chromium_src-05398f5f735ac47b070f7c6897b4d25a1aae8ca9.tar.gz chromium_src-05398f5f735ac47b070f7c6897b4d25a1aae8ca9.tar.bz2 | |
Load non-locale .pak files directly from the .apk on Android (rather than extracting on start-up).
BUG=394502
Review URL: https://codereview.chromium.org/1181953002
Cr-Commit-Position: refs/heads/master@{#335964}
Diffstat (limited to 'chromecast/browser/cast_content_browser_client.h')
| -rw-r--r-- | chromecast/browser/cast_content_browser_client.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chromecast/browser/cast_content_browser_client.h b/chromecast/browser/cast_content_browser_client.h index 942a4c0..1db6ba3 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( |