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 ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ |
6 #define ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ | 6 #define ASH_SHELL_CONTENT_CLIENT_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" |
(...skipping 15 matching lines...) Expand all Loading... |
26 ShellContentBrowserClient(); | 26 ShellContentBrowserClient(); |
27 ~ShellContentBrowserClient() override; | 27 ~ShellContentBrowserClient() override; |
28 | 28 |
29 // Overridden from content::ContentBrowserClient: | 29 // Overridden from content::ContentBrowserClient: |
30 content::BrowserMainParts* CreateBrowserMainParts( | 30 content::BrowserMainParts* CreateBrowserMainParts( |
31 const content::MainFunctionParams& parameters) override; | 31 const content::MainFunctionParams& parameters) override; |
32 net::URLRequestContextGetter* CreateRequestContext( | 32 net::URLRequestContextGetter* CreateRequestContext( |
33 content::BrowserContext* browser_context, | 33 content::BrowserContext* browser_context, |
34 content::ProtocolHandlerMap* protocol_handlers, | 34 content::ProtocolHandlerMap* protocol_handlers, |
35 content::URLRequestInterceptorScopedVector request_interceptors) override; | 35 content::URLRequestInterceptorScopedVector request_interceptors) override; |
| 36 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 37 void GetAdditionalMappedFilesForChildProcess( |
| 38 const base::CommandLine& command_line, |
| 39 int child_process_id, |
| 40 content::FileDescriptorInfo* mappings) override; |
| 41 #endif |
36 | 42 |
37 content::ShellBrowserContext* browser_context(); | 43 content::ShellBrowserContext* browser_context(); |
38 | 44 |
39 private: | 45 private: |
| 46 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 47 base::ScopedFD v8_natives_fd_; |
| 48 base::ScopedFD v8_snapshot_fd_; |
| 49 #endif |
| 50 |
40 ShellBrowserMainParts* shell_browser_main_parts_; | 51 ShellBrowserMainParts* shell_browser_main_parts_; |
41 | 52 |
42 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient); | 53 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient); |
43 }; | 54 }; |
44 | 55 |
45 } // namespace shell | 56 } // namespace shell |
46 } // namespace ash | 57 } // namespace ash |
47 | 58 |
48 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ | 59 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |