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 13 matching lines...) Expand all Loading... |
24 class ShellContentBrowserClient : public content::ContentBrowserClient { | 24 class ShellContentBrowserClient : public content::ContentBrowserClient { |
25 public: | 25 public: |
26 ShellContentBrowserClient(); | 26 ShellContentBrowserClient(); |
27 virtual ~ShellContentBrowserClient(); | 27 virtual ~ShellContentBrowserClient(); |
28 | 28 |
29 // Overridden from content::ContentBrowserClient: | 29 // Overridden from content::ContentBrowserClient: |
30 virtual content::BrowserMainParts* CreateBrowserMainParts( | 30 virtual content::BrowserMainParts* CreateBrowserMainParts( |
31 const content::MainFunctionParams& parameters) OVERRIDE; | 31 const content::MainFunctionParams& parameters) OVERRIDE; |
32 virtual net::URLRequestContextGetter* CreateRequestContext( | 32 virtual net::URLRequestContextGetter* CreateRequestContext( |
33 content::BrowserContext* browser_context, | 33 content::BrowserContext* browser_context, |
34 content::ProtocolHandlerMap* protocol_handlers) OVERRIDE; | 34 content::ProtocolHandlerMap* protocol_handlers, |
| 35 content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE; |
35 | 36 |
36 content::ShellBrowserContext* browser_context(); | 37 content::ShellBrowserContext* browser_context(); |
37 | 38 |
38 private: | 39 private: |
39 ShellBrowserMainParts* shell_browser_main_parts_; | 40 ShellBrowserMainParts* shell_browser_main_parts_; |
40 | 41 |
41 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient); | 42 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient); |
42 }; | 43 }; |
43 | 44 |
44 } // namespace shell | 45 } // namespace shell |
45 } // namespace ash | 46 } // namespace ash |
46 | 47 |
47 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ | 48 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |