| 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 575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 586 | 586 |
| 587 #if defined(ENABLE_EXTENSIONS) | 587 #if defined(ENABLE_EXTENSIONS) |
| 588 globals_->extension_event_router_forwarder = | 588 globals_->extension_event_router_forwarder = |
| 589 extension_event_router_forwarder_; | 589 extension_event_router_forwarder_; |
| 590 #endif | 590 #endif |
| 591 | 591 |
| 592 scoped_ptr<ChromeNetworkDelegate> chrome_network_delegate( | 592 scoped_ptr<ChromeNetworkDelegate> chrome_network_delegate( |
| 593 new ChromeNetworkDelegate(extension_event_router_forwarder(), | 593 new ChromeNetworkDelegate(extension_event_router_forwarder(), |
| 594 &system_enable_referrers_)); | 594 &system_enable_referrers_)); |
| 595 | 595 |
| 596 if (command_line.HasSwitch(switches::kEnableClientHints)) | |
| 597 chrome_network_delegate->SetEnableClientHints(); | |
| 598 | |
| 599 #if defined(ENABLE_EXTENSIONS) | 596 #if defined(ENABLE_EXTENSIONS) |
| 600 if (command_line.HasSwitch(switches::kDisableExtensionsHttpThrottling)) | 597 if (command_line.HasSwitch(switches::kDisableExtensionsHttpThrottling)) |
| 601 chrome_network_delegate->NeverThrottleRequests(); | 598 chrome_network_delegate->NeverThrottleRequests(); |
| 602 #endif | 599 #endif |
| 603 | 600 |
| 604 globals_->system_network_delegate = chrome_network_delegate.Pass(); | 601 globals_->system_network_delegate = chrome_network_delegate.Pass(); |
| 605 globals_->host_resolver = CreateGlobalHostResolver(net_log_); | 602 globals_->host_resolver = CreateGlobalHostResolver(net_log_); |
| 606 UpdateDnsClientEnabled(); | 603 UpdateDnsClientEnabled(); |
| 607 #if defined(OS_CHROMEOS) | 604 #if defined(OS_CHROMEOS) |
| 608 // Creates a CertVerifyProc that doesn't allow any profile-provided certs. | 605 // Creates a CertVerifyProc that doesn't allow any profile-provided certs. |
| (...skipping 829 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1438 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); | 1435 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); |
| 1439 for (size_t i = 0; i < supported_versions.size(); ++i) { | 1436 for (size_t i = 0; i < supported_versions.size(); ++i) { |
| 1440 net::QuicVersion version = supported_versions[i]; | 1437 net::QuicVersion version = supported_versions[i]; |
| 1441 if (net::QuicVersionToString(version) == quic_version) { | 1438 if (net::QuicVersionToString(version) == quic_version) { |
| 1442 return version; | 1439 return version; |
| 1443 } | 1440 } |
| 1444 } | 1441 } |
| 1445 | 1442 |
| 1446 return net::QUIC_VERSION_UNSUPPORTED; | 1443 return net::QUIC_VERSION_UNSUPPORTED; |
| 1447 } | 1444 } |
| OLD | NEW |