OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ |
6 #define CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ | 6 #define CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
11 #include "base/files/file_path.h" | 11 #include "base/files/file_path.h" |
12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
13 #include "content/public/browser/content_browser_client.h" | 13 #include "content/public/browser/content_browser_client.h" |
14 #include "content/shell/browser/shell_speech_recognition_manager_delegate.h" | 14 #include "content/shell/browser/shell_speech_recognition_manager_delegate.h" |
15 #include "gin/v8_initializer.h" | |
15 | 16 |
16 namespace content { | 17 namespace content { |
17 | 18 |
18 class ShellBrowserContext; | 19 class ShellBrowserContext; |
19 class ShellBrowserMainParts; | 20 class ShellBrowserMainParts; |
20 class ShellResourceDispatcherHostDelegate; | 21 class ShellResourceDispatcherHostDelegate; |
21 | 22 |
22 class ShellContentBrowserClient : public ContentBrowserClient { | 23 class ShellContentBrowserClient : public ContentBrowserClient { |
23 public: | 24 public: |
24 // Gets the current instance. | 25 // Gets the current instance. |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
103 } | 104 } |
104 | 105 |
105 private: | 106 private: |
106 ShellBrowserContext* ShellBrowserContextForBrowserContext( | 107 ShellBrowserContext* ShellBrowserContextForBrowserContext( |
107 BrowserContext* content_browser_context); | 108 BrowserContext* content_browser_context); |
108 | 109 |
109 scoped_ptr<ShellResourceDispatcherHostDelegate> | 110 scoped_ptr<ShellResourceDispatcherHostDelegate> |
110 resource_dispatcher_host_delegate_; | 111 resource_dispatcher_host_delegate_; |
111 | 112 |
112 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 113 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
113 base::ScopedFD v8_natives_fd_; | 114 gin::V8Initializer::V8Files v8_files_; |
rmcilroy
2015/06/09 11:52:54
Previously the fds were being stored as ScopedFD w
| |
114 base::ScopedFD v8_snapshot_fd_; | |
115 bool natives_fd_exists() { return v8_natives_fd_ != -1; } | |
116 bool snapshot_fd_exists() { return v8_snapshot_fd_ != -1; } | |
117 #endif | 115 #endif |
118 | 116 |
119 base::Closure select_client_certificate_callback_; | 117 base::Closure select_client_certificate_callback_; |
120 | 118 |
121 ShellBrowserMainParts* shell_browser_main_parts_; | 119 ShellBrowserMainParts* shell_browser_main_parts_; |
122 }; | 120 }; |
123 | 121 |
124 } // namespace content | 122 } // namespace content |
125 | 123 |
126 #endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ | 124 #endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |