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

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

Issue 533003002: Use chromium version for data reduction proxy version (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | components/data_reduction_proxy.gypi » ('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 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 225
226 #if defined(SPDY_PROXY_AUTH_ORIGIN) 226 #if defined(SPDY_PROXY_AUTH_ORIGIN)
227 AwBrowserContext* browser_context = AwBrowserContext::GetDefault(); 227 AwBrowserContext* browser_context = AwBrowserContext::GetDefault();
228 DCHECK(browser_context); 228 DCHECK(browser_context);
229 DataReductionProxySettings* data_reduction_proxy_settings = 229 DataReductionProxySettings* data_reduction_proxy_settings =
230 browser_context->GetDataReductionProxySettings(); 230 browser_context->GetDataReductionProxySettings();
231 DCHECK(data_reduction_proxy_settings); 231 DCHECK(data_reduction_proxy_settings);
232 data_reduction_proxy_auth_request_handler_.reset( 232 data_reduction_proxy_auth_request_handler_.reset(
233 new data_reduction_proxy::DataReductionProxyAuthRequestHandler( 233 new data_reduction_proxy::DataReductionProxyAuthRequestHandler(
234 data_reduction_proxy::kClientAndroidWebview, 234 data_reduction_proxy::kClientAndroidWebview,
235 data_reduction_proxy::kAndroidWebViewProtocolVersion, 235 data_reduction_proxy::DataReductionProxyAuthRequestHandler::
sgurun-gerrit only 2014/09/03 22:07:53 I don't think there is any other usage of this con
236 ChromiumVersion(),
236 data_reduction_proxy_settings->params(), 237 data_reduction_proxy_settings->params(),
237 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))); 238 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
238 239
239 aw_network_delegate->set_data_reduction_proxy_params( 240 aw_network_delegate->set_data_reduction_proxy_params(
240 data_reduction_proxy_settings->params()); 241 data_reduction_proxy_settings->params());
241 aw_network_delegate->set_data_reduction_proxy_auth_request_handler( 242 aw_network_delegate->set_data_reduction_proxy_auth_request_handler(
242 data_reduction_proxy_auth_request_handler_.get()); 243 data_reduction_proxy_auth_request_handler_.get());
243 #endif 244 #endif
244 245
245 main_http_factory_.reset(main_cache); 246 main_http_factory_.reset(main_cache);
(...skipping 24 matching lines...) Expand all
270 std::swap(protocol_handlers_, *protocol_handlers); 271 std::swap(protocol_handlers_, *protocol_handlers);
271 request_interceptors_.swap(request_interceptors); 272 request_interceptors_.swap(request_interceptors);
272 } 273 }
273 274
274 data_reduction_proxy::DataReductionProxyAuthRequestHandler* 275 data_reduction_proxy::DataReductionProxyAuthRequestHandler*
275 AwURLRequestContextGetter::GetDataReductionProxyAuthRequestHandler() const { 276 AwURLRequestContextGetter::GetDataReductionProxyAuthRequestHandler() const {
276 return data_reduction_proxy_auth_request_handler_.get(); 277 return data_reduction_proxy_auth_request_handler_.get();
277 } 278 }
278 279
279 } // namespace android_webview 280 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | components/data_reduction_proxy.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698