Chromium Code Reviews| Index: chrome/browser/net/ssl_config_service_manager_pref.cc |
| diff --git a/chrome/browser/net/ssl_config_service_manager_pref.cc b/chrome/browser/net/ssl_config_service_manager_pref.cc |
| index dc904ca58c7a14daca6558816fccfb0992e5f275..2f7b2be21b270147c51a7ba562aab1ae56de9b8c 100644 |
| --- a/chrome/browser/net/ssl_config_service_manager_pref.cc |
| +++ b/chrome/browser/net/ssl_config_service_manager_pref.cc |
| @@ -176,6 +176,7 @@ class SSLConfigServiceManagerPref |
| StringPrefMember ssl_version_max_; |
| BooleanPrefMember channel_id_enabled_; |
| BooleanPrefMember ssl_record_splitting_disabled_; |
| + BooleanPrefMember signed_cert_timestamps_enabled_; |
| BooleanPrefMember unrestricted_ssl3_fallback_enabled_; |
| // The cached list of disabled SSL cipher suites. |
| @@ -214,6 +215,8 @@ SSLConfigServiceManagerPref::SSLConfigServiceManagerPref( |
| prefs::kEnableUnrestrictedSSL3Fallback, |
| local_state, |
| local_state_callback); |
| + signed_cert_timestamps_enabled_.Init( |
|
wtc
2013/11/26 22:46:12
Nit: move this up to follow ssl_record_splitting_d
ekasper
2013/11/27 14:09:04
No longer applies: this part is reverted.
|
| + prefs::kEnableSignedCertTimestamps, local_state, local_state_callback); |
| local_state_change_registrar_.Init(local_state); |
| local_state_change_registrar_.Add( |
| @@ -246,6 +249,8 @@ void SSLConfigServiceManagerPref::RegisterPrefs(PrefRegistrySimple* registry) { |
| !default_config.false_start_enabled); |
| registry->RegisterBooleanPref(prefs::kEnableUnrestrictedSSL3Fallback, |
| default_config.unrestricted_ssl3_fallback_enabled); |
| + registry->RegisterBooleanPref(prefs::kEnableSignedCertTimestamps, |
| + default_config.signed_cert_timestamps_enabled); |
| registry->RegisterListPref(prefs::kCipherSuiteBlacklist); |
| } |
| @@ -306,6 +311,8 @@ void SSLConfigServiceManagerPref::GetSSLConfigFromPrefs( |
| config->false_start_enabled = !ssl_record_splitting_disabled_.GetValue(); |
| config->unrestricted_ssl3_fallback_enabled = |
| unrestricted_ssl3_fallback_enabled_.GetValue(); |
| + config->signed_cert_timestamps_enabled = |
|
wtc
2013/11/26 22:46:12
Nit: also move this up.
ekasper
2013/11/27 14:09:04
Ditto.
|
| + signed_cert_timestamps_enabled_.GetValue(); |
| SSLConfigServicePref::SetSSLConfigFlags(config); |
| } |