Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2103)

Side by Side Diff: android_webview/browser/net/aw_url_request_context_getter.cc

Issue 1268313004: s/use_alternate_protocols/use_alternative_services/g (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re: #15. Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/io_thread.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "android_webview/browser/net/aw_url_request_context_getter.h" 5 #include "android_webview/browser/net/aw_url_request_context_getter.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "android_webview/browser/aw_browser_context.h" 9 #include "android_webview/browser/aw_browser_context.h"
10 #include "android_webview/browser/aw_content_browser_client.h" 10 #include "android_webview/browser/aw_content_browser_client.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 params->channel_id_service = context->channel_id_service(); 96 params->channel_id_service = context->channel_id_service();
97 params->transport_security_state = context->transport_security_state(); 97 params->transport_security_state = context->transport_security_state();
98 params->proxy_service = context->proxy_service(); 98 params->proxy_service = context->proxy_service();
99 params->ssl_config_service = context->ssl_config_service(); 99 params->ssl_config_service = context->ssl_config_service();
100 params->http_auth_handler_factory = context->http_auth_handler_factory(); 100 params->http_auth_handler_factory = context->http_auth_handler_factory();
101 params->network_delegate = context->network_delegate(); 101 params->network_delegate = context->network_delegate();
102 params->http_server_properties = context->http_server_properties(); 102 params->http_server_properties = context->http_server_properties();
103 params->net_log = context->net_log(); 103 params->net_log = context->net_log();
104 // TODO(sgurun) remove once crbug.com/329681 is fixed. 104 // TODO(sgurun) remove once crbug.com/329681 is fixed.
105 params->next_protos = net::NextProtosSpdy31(); 105 params->next_protos = net::NextProtosSpdy31();
106 params->use_alternate_protocols = true; 106 params->use_alternative_services = true;
107 107
108 ApplyCmdlineOverridesToNetworkSessionParams(params); 108 ApplyCmdlineOverridesToNetworkSessionParams(params);
109 } 109 }
110 110
111 scoped_ptr<net::URLRequestJobFactory> CreateJobFactory( 111 scoped_ptr<net::URLRequestJobFactory> CreateJobFactory(
112 content::ProtocolHandlerMap* protocol_handlers, 112 content::ProtocolHandlerMap* protocol_handlers,
113 content::URLRequestInterceptorScopedVector request_interceptors) { 113 content::URLRequestInterceptorScopedVector request_interceptors) {
114 scoped_ptr<AwURLRequestJobFactory> aw_job_factory(new AwURLRequestJobFactory); 114 scoped_ptr<AwURLRequestJobFactory> aw_job_factory(new AwURLRequestJobFactory);
115 // Note that the registered schemes must also be specified in 115 // Note that the registered schemes must also be specified in
116 // AwContentBrowserClient::IsHandledURL. 116 // AwContentBrowserClient::IsHandledURL.
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 return net_log_.get(); 275 return net_log_.get();
276 } 276 }
277 277
278 void AwURLRequestContextGetter::SetKeyOnIO(const std::string& key) { 278 void AwURLRequestContextGetter::SetKeyOnIO(const std::string& key) {
279 DCHECK(AwBrowserContext::GetDefault()->GetDataReductionProxyIOData()); 279 DCHECK(AwBrowserContext::GetDefault()->GetDataReductionProxyIOData());
280 AwBrowserContext::GetDefault()->GetDataReductionProxyIOData()-> 280 AwBrowserContext::GetDefault()->GetDataReductionProxyIOData()->
281 request_options()->SetKeyOnIO(key); 281 request_options()->SetKeyOnIO(key);
282 } 282 }
283 283
284 } // namespace android_webview 284 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/io_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698