Chromium Code Reviews| 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 "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 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 529 new LoggingNetworkChangeObserver(net_log_)); | 529 new LoggingNetworkChangeObserver(net_log_)); |
| 530 | 530 |
| 531 // Setup the HistogramWatcher to run on the IO thread. | 531 // Setup the HistogramWatcher to run on the IO thread. |
| 532 net::NetworkChangeNotifier::InitHistogramWatcher(); | 532 net::NetworkChangeNotifier::InitHistogramWatcher(); |
| 533 | 533 |
| 534 globals_->extension_event_router_forwarder = | 534 globals_->extension_event_router_forwarder = |
| 535 extension_event_router_forwarder_; | 535 extension_event_router_forwarder_; |
| 536 ChromeNetworkDelegate* network_delegate = | 536 ChromeNetworkDelegate* network_delegate = |
| 537 new ChromeNetworkDelegate(extension_event_router_forwarder_, | 537 new ChromeNetworkDelegate(extension_event_router_forwarder_, |
| 538 &system_enable_referrers_); | 538 &system_enable_referrers_); |
| 539 network_delegate->set_data_reduction_proxy_params( | |
| 540 globals_->data_reduction_proxy_params.get()); | |
|
Lei Zhang
2014/06/16 20:48:53
Is this too early? globals_->data_reduction_proxy_
bengr
2014/06/17 03:49:33
Thank you! Done.
| |
| 539 if (command_line.HasSwitch(switches::kEnableClientHints)) | 541 if (command_line.HasSwitch(switches::kEnableClientHints)) |
| 540 network_delegate->SetEnableClientHints(); | 542 network_delegate->SetEnableClientHints(); |
| 541 if (command_line.HasSwitch(switches::kDisableExtensionsHttpThrottling)) | 543 if (command_line.HasSwitch(switches::kDisableExtensionsHttpThrottling)) |
| 542 network_delegate->NeverThrottleRequests(); | 544 network_delegate->NeverThrottleRequests(); |
| 543 globals_->system_network_delegate.reset(network_delegate); | 545 globals_->system_network_delegate.reset(network_delegate); |
| 544 globals_->host_resolver = CreateGlobalHostResolver(net_log_); | 546 globals_->host_resolver = CreateGlobalHostResolver(net_log_); |
| 545 UpdateDnsClientEnabled(); | 547 UpdateDnsClientEnabled(); |
| 546 #if defined(OS_CHROMEOS) | 548 #if defined(OS_CHROMEOS) |
| 547 // Creates a CertVerifyProc that doesn't allow any profile-provided certs. | 549 // Creates a CertVerifyProc that doesn't allow any profile-provided certs. |
| 548 globals_->cert_verifier.reset(new net::MultiThreadedCertVerifier( | 550 globals_->cert_verifier.reset(new net::MultiThreadedCertVerifier( |
| (...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1216 std::string version_flag = | 1218 std::string version_flag = |
| 1217 command_line.GetSwitchValueASCII(switches::kQuicVersion); | 1219 command_line.GetSwitchValueASCII(switches::kQuicVersion); |
| 1218 for (size_t i = 0; i < supported_versions.size(); ++i) { | 1220 for (size_t i = 0; i < supported_versions.size(); ++i) { |
| 1219 net::QuicVersion version = supported_versions[i]; | 1221 net::QuicVersion version = supported_versions[i]; |
| 1220 if (net::QuicVersionToString(version) == version_flag) { | 1222 if (net::QuicVersionToString(version) == version_flag) { |
| 1221 return version; | 1223 return version; |
| 1222 } | 1224 } |
| 1223 } | 1225 } |
| 1224 return net::QUIC_VERSION_UNSUPPORTED; | 1226 return net::QUIC_VERSION_UNSUPPORTED; |
| 1225 } | 1227 } |
| OLD | NEW |