| 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 5e5c262f92a103087e4856b5e9ec9a72bf0bc45f..b1f6fe8ed6098c7eaf4321daf4061d9adacf079b 100644
|
| --- a/chromecast/browser/cast_content_browser_client.h
|
| +++ b/chromecast/browser/cast_content_browser_client.h
|
| @@ -12,6 +12,7 @@
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "content/public/browser/content_browser_client.h"
|
| +#include "gin/v8_initializer.h"
|
|
|
| namespace breakpad {
|
| class CrashHandlerHostLinux;
|
| @@ -100,7 +101,11 @@ class CastContentBrowserClient: public content::ContentBrowserClient {
|
| void GetAdditionalMappedFilesForChildProcess(
|
| const base::CommandLine& command_line,
|
| int child_process_id,
|
| - content::FileDescriptorInfo* mappings) override;
|
| + content::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(
|
| @@ -129,8 +134,7 @@ class CastContentBrowserClient: public content::ContentBrowserClient {
|
| std::map<std::string, breakpad::CrashHandlerHostLinux*> crash_handlers_;
|
| #endif
|
|
|
| - base::ScopedFD v8_natives_fd_;
|
| - base::ScopedFD v8_snapshot_fd_;
|
| + gin::V8Initializer::V8Files v8_files_;
|
|
|
| scoped_ptr<URLRequestContextFactory> url_request_context_factory_;
|
|
|
|
|