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

Side by Side Diff: chrome/browser/io_thread.cc

Issue 530153002: Add build and patch to Chrome-Proxy header (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change GetChromiumVersionComponent to GetChromiumBuildAndPatch 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 | chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.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 "chrome/browser/io_thread.h" 5 #include "chrome/browser/io_thread.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 IsIncludedInPromoFieldTrial()) 653 IsIncludedInPromoFieldTrial())
654 drp_flags |= data_reduction_proxy::DataReductionProxyParams::kPromoAllowed; 654 drp_flags |= data_reduction_proxy::DataReductionProxyParams::kPromoAllowed;
655 if (data_reduction_proxy::DataReductionProxyParams:: 655 if (data_reduction_proxy::DataReductionProxyParams::
656 IsIncludedInHoldbackFieldTrial()) 656 IsIncludedInHoldbackFieldTrial())
657 drp_flags |= data_reduction_proxy::DataReductionProxyParams::kHoldback; 657 drp_flags |= data_reduction_proxy::DataReductionProxyParams::kHoldback;
658 globals_->data_reduction_proxy_params.reset( 658 globals_->data_reduction_proxy_params.reset(
659 new data_reduction_proxy::DataReductionProxyParams(drp_flags)); 659 new data_reduction_proxy::DataReductionProxyParams(drp_flags));
660 globals_->data_reduction_proxy_auth_request_handler.reset( 660 globals_->data_reduction_proxy_auth_request_handler.reset(
661 new data_reduction_proxy::DataReductionProxyAuthRequestHandler( 661 new data_reduction_proxy::DataReductionProxyAuthRequestHandler(
662 DataReductionProxyChromeSettings::GetClient(), 662 DataReductionProxyChromeSettings::GetClient(),
663 DataReductionProxyChromeSettings::GetBuildAndPatchNumber(), 663 chrome::VersionInfo().Version(),
664 globals_->data_reduction_proxy_params.get(), 664 globals_->data_reduction_proxy_params.get(),
665 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))); 665 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
666 // This is the same as in ProfileImplIOData except that we do not collect 666 // This is the same as in ProfileImplIOData except that we do not collect
667 // usage stats. 667 // usage stats.
668 network_delegate->set_data_reduction_proxy_params( 668 network_delegate->set_data_reduction_proxy_params(
669 globals_->data_reduction_proxy_params.get()); 669 globals_->data_reduction_proxy_params.get());
670 network_delegate->set_data_reduction_proxy_auth_request_handler( 670 network_delegate->set_data_reduction_proxy_auth_request_handler(
671 globals_->data_reduction_proxy_auth_request_handler.get()); 671 globals_->data_reduction_proxy_auth_request_handler.get());
672 network_delegate->set_on_resolve_proxy_handler( 672 network_delegate->set_on_resolve_proxy_handler(
673 base::Bind(data_reduction_proxy::OnResolveProxyHandler)); 673 base::Bind(data_reduction_proxy::OnResolveProxyHandler));
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after
1405 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); 1405 net::QuicVersionVector supported_versions = net::QuicSupportedVersions();
1406 for (size_t i = 0; i < supported_versions.size(); ++i) { 1406 for (size_t i = 0; i < supported_versions.size(); ++i) {
1407 net::QuicVersion version = supported_versions[i]; 1407 net::QuicVersion version = supported_versions[i];
1408 if (net::QuicVersionToString(version) == quic_version) { 1408 if (net::QuicVersionToString(version) == quic_version) {
1409 return version; 1409 return version;
1410 } 1410 }
1411 } 1411 }
1412 1412
1413 return net::QUIC_VERSION_UNSUPPORTED; 1413 return net::QUIC_VERSION_UNSUPPORTED;
1414 } 1414 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698