| Index: chrome/browser/chrome_content_browser_client.h
|
| diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
|
| index 89f7b2231df55e6944cadf2fbd1804afd7e54e08..287a63c599f2bedfb851adf588f74f9392973c1d 100644
|
| --- a/chrome/browser/chrome_content_browser_client.h
|
| +++ b/chrome/browser/chrome_content_browser_client.h
|
| @@ -16,6 +16,7 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "chrome/common/chrome_version_info.h"
|
| #include "content/public/browser/content_browser_client.h"
|
| +#include "gin/v8_initializer.h"
|
|
|
| class ChromeContentBrowserClientParts;
|
|
|
| @@ -243,7 +244,11 @@ class ChromeContentBrowserClient : 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
|
| #if defined(OS_WIN)
|
| const wchar_t* GetResourceDllName() override;
|
| @@ -291,6 +296,10 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
|
| const base::Callback<void(bool)>& callback);
|
| #endif
|
|
|
| +#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
| + void LazyPrepV8StartupData();
|
| +#endif
|
| +
|
| #if defined(ENABLE_PLUGINS)
|
| // Set of origins that can use TCP/UDP private APIs from NaCl.
|
| std::set<std::string> allowed_socket_origins_;
|
| @@ -302,8 +311,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
|
| #endif
|
|
|
| #if defined(OS_POSIX) && !defined(OS_MACOSX)
|
| - base::ScopedFD v8_natives_fd_;
|
| - base::ScopedFD v8_snapshot_fd_;
|
| + gin::V8Initializer::V8Files v8_files_;
|
| #endif // OS_POSIX && !OS_MACOSX
|
|
|
| // Vector of additional ChromeContentBrowserClientParts.
|
|
|