| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
| 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 content::BrowserContext* browser_context, | 236 content::BrowserContext* browser_context, |
| 237 const GURL& url) override; | 237 const GURL& url) override; |
| 238 void OverridePageVisibilityState( | 238 void OverridePageVisibilityState( |
| 239 content::RenderFrameHost* render_frame_host, | 239 content::RenderFrameHost* render_frame_host, |
| 240 blink::WebPageVisibilityState* visibility_state) override; | 240 blink::WebPageVisibilityState* visibility_state) override; |
| 241 | 241 |
| 242 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 242 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 243 void GetAdditionalMappedFilesForChildProcess( | 243 void GetAdditionalMappedFilesForChildProcess( |
| 244 const base::CommandLine& command_line, | 244 const base::CommandLine& command_line, |
| 245 int child_process_id, | 245 int child_process_id, |
| 246 content::FileDescriptorInfo* mappings) override; | 246 content::FileDescriptorInfo* mappings |
| 247 #if defined(OS_ANDROID) |
| 248 , |
| 249 std::map<int, base::MemoryMappedFile::Region>* regions |
| 250 #endif |
| 251 ) override; |
| 247 #endif | 252 #endif |
| 248 #if defined(OS_WIN) | 253 #if defined(OS_WIN) |
| 249 const wchar_t* GetResourceDllName() override; | 254 const wchar_t* GetResourceDllName() override; |
| 250 void PreSpawnRenderer(sandbox::TargetPolicy* policy, bool* success) override; | 255 void PreSpawnRenderer(sandbox::TargetPolicy* policy, bool* success) override; |
| 251 #endif | 256 #endif |
| 252 void OverrideRenderFrameMojoServices( | 257 void OverrideRenderFrameMojoServices( |
| 253 content::ServiceRegistry* registry, | 258 content::ServiceRegistry* registry, |
| 254 content::RenderFrameHost* render_frame_host) override; | 259 content::RenderFrameHost* render_frame_host) override; |
| 255 void OpenURL(content::BrowserContext* browser_context, | 260 void OpenURL(content::BrowserContext* browser_context, |
| 256 const content::OpenURLParams& params, | 261 const content::OpenURLParams& params, |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 298 std::set<std::string> allowed_file_handle_origins_; | 303 std::set<std::string> allowed_file_handle_origins_; |
| 299 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable | 304 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable |
| 300 // versions of Chrome. | 305 // versions of Chrome. |
| 301 std::set<std::string> allowed_dev_channel_origins_; | 306 std::set<std::string> allowed_dev_channel_origins_; |
| 302 #endif | 307 #endif |
| 303 | 308 |
| 304 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 309 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 305 base::ScopedFD v8_natives_fd_; | 310 base::ScopedFD v8_natives_fd_; |
| 306 base::ScopedFD v8_snapshot_fd_; | 311 base::ScopedFD v8_snapshot_fd_; |
| 307 #endif // OS_POSIX && !OS_MACOSX | 312 #endif // OS_POSIX && !OS_MACOSX |
| 313 #if defined(OS_ANDROID) |
| 314 base::ScopedFD icudtl_fd_; |
| 315 base::MemoryMappedFile::Region icudtl_region_; |
| 316 #endif |
| 308 | 317 |
| 309 // Vector of additional ChromeContentBrowserClientParts. | 318 // Vector of additional ChromeContentBrowserClientParts. |
| 310 // Parts are deleted in the reverse order they are added. | 319 // Parts are deleted in the reverse order they are added. |
| 311 std::vector<ChromeContentBrowserClientParts*> extra_parts_; | 320 std::vector<ChromeContentBrowserClientParts*> extra_parts_; |
| 312 | 321 |
| 313 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 322 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
| 314 | 323 |
| 315 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 324 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
| 316 }; | 325 }; |
| 317 | 326 |
| 318 } // namespace chrome | 327 } // namespace chrome |
| 319 | 328 |
| 320 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 329 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |