| Index: extensions/shell/browser/shell_content_browser_client.h
|
| diff --git a/extensions/shell/browser/shell_content_browser_client.h b/extensions/shell/browser/shell_content_browser_client.h
|
| index f9d813f525c196b1c136ab259b1e43c9750f7fa6..252dfb972c2cc1bfb9474059662138eef5aeebea 100644
|
| --- a/extensions/shell/browser/shell_content_browser_client.h
|
| +++ b/extensions/shell/browser/shell_content_browser_client.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "content/public/browser/content_browser_client.h"
|
| +#include "gin/v8_initializer.h"
|
|
|
| class GURL;
|
|
|
| @@ -62,7 +63,11 @@ class ShellContentBrowserClient : 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;
|
| #endif
|
|
|
| content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() override;
|
| @@ -81,8 +86,7 @@ class ShellContentBrowserClient : public content::ContentBrowserClient {
|
| const Extension* GetExtension(content::SiteInstance* site_instance);
|
|
|
| #if defined(OS_POSIX) && !defined(OS_MACOSX)
|
| - base::ScopedFD v8_natives_fd_;
|
| - base::ScopedFD v8_snapshot_fd_;
|
| + gin::V8Initializer::V8Files v8_files_;
|
| #endif
|
|
|
| // Owned by content::BrowserMainLoop.
|
|
|