OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ui/views_content_client/views_content_browser_client.h" | 5 #include "ui/views_content_client/views_content_browser_client.h" |
6 | 6 |
7 #include "content/shell/browser/shell_browser_context.h" | 7 #include "content/shell/browser/shell_browser_context.h" |
8 #include "ui/views_content_client/views_content_client_main_parts.h" | 8 #include "ui/views_content_client/views_content_client_main_parts.h" |
9 | 9 |
10 namespace ui { | 10 namespace ui { |
(...skipping 11 matching lines...) Expand all Loading... |
22 const content::MainFunctionParams& parameters) { | 22 const content::MainFunctionParams& parameters) { |
23 views_content_main_parts_ = | 23 views_content_main_parts_ = |
24 new ViewsContentClientMainParts(parameters, views_content_client_); | 24 new ViewsContentClientMainParts(parameters, views_content_client_); |
25 return views_content_main_parts_; | 25 return views_content_main_parts_; |
26 } | 26 } |
27 | 27 |
28 net::URLRequestContextGetter* | 28 net::URLRequestContextGetter* |
29 ViewsContentBrowserClient::CreateRequestContext( | 29 ViewsContentBrowserClient::CreateRequestContext( |
30 content::BrowserContext* content_browser_context, | 30 content::BrowserContext* content_browser_context, |
31 content::ProtocolHandlerMap* protocol_handlers, | 31 content::ProtocolHandlerMap* protocol_handlers, |
32 content::ProtocolHandlerScopedVector protocol_interceptors) { | 32 content::URLRequestInterceptorScopedVector request_interceptors) { |
33 content::ShellBrowserContext* shell_context = | 33 content::ShellBrowserContext* shell_context = |
34 views_content_main_parts_->browser_context(); | 34 views_content_main_parts_->browser_context(); |
35 return shell_context->CreateRequestContext(protocol_handlers, | 35 return shell_context->CreateRequestContext(protocol_handlers, |
36 protocol_interceptors.Pass()); | 36 request_interceptors.Pass()); |
37 } | 37 } |
38 | 38 |
39 } // namespace ui | 39 } // namespace ui |
OLD | NEW |