Chromium Code Reviews| Index: extensions/shell/browser/shell_content_browser_client.cc |
| diff --git a/extensions/shell/browser/shell_content_browser_client.cc b/extensions/shell/browser/shell_content_browser_client.cc |
| index 905a3438ff89265e5c77973c92c20df6d284dcb4..f44c0541da5bacc63306dadc49e9ee0f472decb3 100644 |
| --- a/extensions/shell/browser/shell_content_browser_client.cc |
| +++ b/extensions/shell/browser/shell_content_browser_client.cc |
| @@ -8,6 +8,7 @@ |
| #include "content/public/browser/browser_thread.h" |
| #include "content/public/browser/render_process_host.h" |
| #include "content/public/browser/site_instance.h" |
| +#include "content/public/common/content_descriptors.h" |
| #include "content/public/common/content_switches.h" |
| #include "content/public/common/url_constants.h" |
| #include "content/shell/browser/shell_browser_context.h" |
| @@ -26,6 +27,7 @@ |
| #include "extensions/shell/browser/shell_browser_main_parts.h" |
| #include "extensions/shell/browser/shell_extension_system.h" |
| #include "extensions/shell/browser/shell_speech_recognition_manager_delegate.h" |
| +#include "gin/public/isolate_holder.h" |
| #include "url/gurl.h" |
| #if !defined(DISABLE_NACL) |
| @@ -51,7 +53,13 @@ ShellContentBrowserClient* g_instance = NULL; |
| ShellContentBrowserClient::ShellContentBrowserClient( |
| ShellBrowserMainDelegate* browser_main_delegate) |
| - : browser_main_parts_(NULL), browser_main_delegate_(browser_main_delegate) { |
| + : |
| +#if defined(OS_POSIX) && !defined(OS_MACOSX) |
| + v8_natives_fd_(-1), |
| + v8_snapshot_fd_(-1), |
| +#endif // OS_POSIX && !OS_MACOSX |
| + browser_main_parts_(NULL), |
|
James Cook
2015/03/18 23:20:06
Can you switch this to nullptr since you're here?
rmcilroy
2015/03/19 14:41:39
Done.
|
| + browser_main_delegate_(browser_main_delegate) { |
| DCHECK(!g_instance); |
| g_instance = this; |
| } |
| @@ -229,6 +237,27 @@ void ShellContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( |
| additional_allowed_schemes->push_back(kExtensionScheme); |
| } |
| +#if defined(OS_POSIX) && !defined(OS_MACOSX) |
| +void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess( |
| + const base::CommandLine& command_line, |
| + int child_process_id, |
| + content::FileDescriptorInfo* mappings) { |
| +#if defined(V8_USE_EXTERNAL_STARTUP_DATA) |
| + if (v8_snapshot_fd_.get() == -1 && v8_natives_fd_.get() == -1) { |
| + int v8_natives_fd = -1; |
| + int v8_snapshot_fd = -1; |
| + if (gin::IsolateHolder::MapV8FilesForChildProcesses(&v8_natives_fd, |
| + &v8_snapshot_fd)) { |
| + v8_natives_fd_.reset(v8_natives_fd); |
| + v8_snapshot_fd_.reset(v8_snapshot_fd); |
| + } |
| + } |
| + mappings->Share(kV8NativesDataDescriptor, v8_natives_fd_.get()); |
| + mappings->Share(kV8SnapshotDataDescriptor, v8_snapshot_fd_.get()); |
| +#endif // V8_USE_EXTERNAL_STARTUP_DATA |
| +} |
| +#endif // OS_POSIX && !OS_MACOSX |
| + |
| content::DevToolsManagerDelegate* |
| ShellContentBrowserClient::GetDevToolsManagerDelegate() { |
| return new content::ShellDevToolsManagerDelegate(GetBrowserContext()); |