| 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 #include "chrome/browser/net/ssl_config_service_manager.h" | 4 #include "chrome/browser/net/ssl_config_service_manager.h" |
| 5 | 5 |
| 6 #include <algorithm> | 6 #include <algorithm> |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 std::string version_min_str = | 237 std::string version_min_str = |
| 238 SSLProtocolVersionToString(default_config.version_min); | 238 SSLProtocolVersionToString(default_config.version_min); |
| 239 std::string version_max_str = | 239 std::string version_max_str = |
| 240 SSLProtocolVersionToString(default_config.version_max); | 240 SSLProtocolVersionToString(default_config.version_max); |
| 241 registry->RegisterStringPref(prefs::kSSLVersionMin, version_min_str); | 241 registry->RegisterStringPref(prefs::kSSLVersionMin, version_min_str); |
| 242 registry->RegisterStringPref(prefs::kSSLVersionMax, version_max_str); | 242 registry->RegisterStringPref(prefs::kSSLVersionMax, version_max_str); |
| 243 registry->RegisterBooleanPref(prefs::kEnableOriginBoundCerts, | 243 registry->RegisterBooleanPref(prefs::kEnableOriginBoundCerts, |
| 244 default_config.channel_id_enabled); | 244 default_config.channel_id_enabled); |
| 245 registry->RegisterBooleanPref(prefs::kDisableSSLRecordSplitting, | 245 registry->RegisterBooleanPref(prefs::kDisableSSLRecordSplitting, |
| 246 !default_config.false_start_enabled); | 246 !default_config.false_start_enabled); |
| 247 // Note: until http://crbug/237055 is resolved, unrestricted SSL 3.0 fallback | |
| 248 // is always enabled. | |
| 249 registry->RegisterBooleanPref(prefs::kEnableUnrestrictedSSL3Fallback, | 247 registry->RegisterBooleanPref(prefs::kEnableUnrestrictedSSL3Fallback, |
| 250 true /* default_config.unrestricted_ssl3_fallback_enabled */); | 248 default_config.unrestricted_ssl3_fallback_enabled); |
| 251 registry->RegisterListPref(prefs::kCipherSuiteBlacklist); | 249 registry->RegisterListPref(prefs::kCipherSuiteBlacklist); |
| 252 } | 250 } |
| 253 | 251 |
| 254 net::SSLConfigService* SSLConfigServiceManagerPref::Get() { | 252 net::SSLConfigService* SSLConfigServiceManagerPref::Get() { |
| 255 return ssl_config_service_.get(); | 253 return ssl_config_service_.get(); |
| 256 } | 254 } |
| 257 | 255 |
| 258 void SSLConfigServiceManagerPref::OnPreferenceChanged( | 256 void SSLConfigServiceManagerPref::OnPreferenceChanged( |
| 259 PrefService* prefs, | 257 PrefService* prefs, |
| 260 const std::string& pref_name_in) { | 258 const std::string& pref_name_in) { |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 323 // static | 321 // static |
| 324 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager( | 322 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager( |
| 325 PrefService* local_state) { | 323 PrefService* local_state) { |
| 326 return new SSLConfigServiceManagerPref(local_state); | 324 return new SSLConfigServiceManagerPref(local_state); |
| 327 } | 325 } |
| 328 | 326 |
| 329 // static | 327 // static |
| 330 void SSLConfigServiceManager::RegisterPrefs(PrefRegistrySimple* registry) { | 328 void SSLConfigServiceManager::RegisterPrefs(PrefRegistrySimple* registry) { |
| 331 SSLConfigServiceManagerPref::RegisterPrefs(registry); | 329 SSLConfigServiceManagerPref::RegisterPrefs(registry); |
| 332 } | 330 } |
| OLD | NEW |