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 #include "ash/shell/content_client/shell_content_browser_client.h" | 5 #include "ash/shell/content_client/shell_content_browser_client.h" |
6 | 6 |
7 #include "ash/shell/content_client/shell_browser_main_parts.h" | 7 #include "ash/shell/content_client/shell_browser_main_parts.h" |
8 #include "content/shell/browser/shell_browser_context.h" | 8 #include "content/shell/browser/shell_browser_context.h" |
9 #include "third_party/skia/include/core/SkBitmap.h" | 9 #include "third_party/skia/include/core/SkBitmap.h" |
10 | 10 |
11 namespace ash { | 11 namespace ash { |
12 namespace shell { | 12 namespace shell { |
13 | 13 |
14 ShellContentBrowserClient::ShellContentBrowserClient() | 14 ShellContentBrowserClient::ShellContentBrowserClient() |
15 : shell_browser_main_parts_(NULL) { | 15 : shell_browser_main_parts_(NULL) { |
16 } | 16 } |
17 | 17 |
18 ShellContentBrowserClient::~ShellContentBrowserClient() { | 18 ShellContentBrowserClient::~ShellContentBrowserClient() { |
19 } | 19 } |
20 | 20 |
21 content::BrowserMainParts* ShellContentBrowserClient::CreateBrowserMainParts( | 21 content::BrowserMainParts* ShellContentBrowserClient::CreateBrowserMainParts( |
22 const content::MainFunctionParams& parameters) { | 22 const content::MainFunctionParams& parameters) { |
23 shell_browser_main_parts_ = new ShellBrowserMainParts(parameters); | 23 shell_browser_main_parts_ = new ShellBrowserMainParts(parameters); |
24 return shell_browser_main_parts_; | 24 return shell_browser_main_parts_; |
25 } | 25 } |
26 | 26 |
27 net::URLRequestContextGetter* ShellContentBrowserClient::CreateRequestContext( | 27 net::URLRequestContextGetter* ShellContentBrowserClient::CreateRequestContext( |
28 content::BrowserContext* content_browser_context, | 28 content::BrowserContext* content_browser_context, |
29 content::ProtocolHandlerMap* protocol_handlers) { | 29 content::ProtocolHandlerMap* protocol_handlers, |
| 30 content::ProtocolHandlerScopedVector protocol_interceptors) { |
30 content::ShellBrowserContext* shell_context = | 31 content::ShellBrowserContext* shell_context = |
31 static_cast<content::ShellBrowserContext*>(content_browser_context); | 32 static_cast<content::ShellBrowserContext*>(content_browser_context); |
32 return shell_context->CreateRequestContext(protocol_handlers); | 33 return shell_context->CreateRequestContext(protocol_handlers, |
| 34 protocol_interceptors.Pass()); |
33 } | 35 } |
34 | 36 |
35 content::ShellBrowserContext* ShellContentBrowserClient::browser_context() { | 37 content::ShellBrowserContext* ShellContentBrowserClient::browser_context() { |
36 return shell_browser_main_parts_->browser_context(); | 38 return shell_browser_main_parts_->browser_context(); |
37 } | 39 } |
38 | 40 |
39 } // namespace examples | 41 } // namespace examples |
40 } // namespace views | 42 } // namespace views |
OLD | NEW |