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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 | 95 |
96 #if defined(USE_NSS) || defined(OS_IOS) | 96 #if defined(USE_NSS) || defined(OS_IOS) |
97 #include "net/ocsp/nss_ocsp.h" | 97 #include "net/ocsp/nss_ocsp.h" |
98 #endif | 98 #endif |
99 | 99 |
100 #if defined(OS_ANDROID) || defined(OS_IOS) | 100 #if defined(OS_ANDROID) || defined(OS_IOS) |
101 #include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.
h" | 101 #include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.
h" |
102 #endif | 102 #endif |
103 | 103 |
104 #if defined(OS_CHROMEOS) | 104 #if defined(OS_CHROMEOS) |
| 105 #include "chrome/browser/chromeos/login/users/user_manager.h" |
105 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h" | 106 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h" |
106 #endif | 107 #endif |
107 | 108 |
108 using content::BrowserThread; | 109 using content::BrowserThread; |
109 | 110 |
110 #if defined(OS_ANDROID) || defined(OS_IOS) | 111 #if defined(OS_ANDROID) || defined(OS_IOS) |
111 using data_reduction_proxy::DataReductionProxySettings; | 112 using data_reduction_proxy::DataReductionProxySettings; |
112 #endif | 113 #endif |
113 | 114 |
114 class SafeBrowsingURLRequestContext; | 115 class SafeBrowsingURLRequestContext; |
(...skipping 1099 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1214 std::string version_flag = | 1215 std::string version_flag = |
1215 command_line.GetSwitchValueASCII(switches::kQuicVersion); | 1216 command_line.GetSwitchValueASCII(switches::kQuicVersion); |
1216 for (size_t i = 0; i < supported_versions.size(); ++i) { | 1217 for (size_t i = 0; i < supported_versions.size(); ++i) { |
1217 net::QuicVersion version = supported_versions[i]; | 1218 net::QuicVersion version = supported_versions[i]; |
1218 if (net::QuicVersionToString(version) == version_flag) { | 1219 if (net::QuicVersionToString(version) == version_flag) { |
1219 return version; | 1220 return version; |
1220 } | 1221 } |
1221 } | 1222 } |
1222 return net::QUIC_VERSION_UNSUPPORTED; | 1223 return net::QUIC_VERSION_UNSUPPORTED; |
1223 } | 1224 } |
OLD | NEW |