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 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
236 registry->RegisterBooleanPref(prefs::kDisableSSLRecordSplitting, | 236 registry->RegisterBooleanPref(prefs::kDisableSSLRecordSplitting, |
237 !default_config.false_start_enabled); | 237 !default_config.false_start_enabled); |
238 // Note: until http://crbug/237055 is resolved, unrestricted SSL 3.0 fallback | 238 // Note: until http://crbug/237055 is resolved, unrestricted SSL 3.0 fallback |
239 // is always enabled. | 239 // is always enabled. |
240 registry->RegisterBooleanPref(prefs::kEnableUnrestrictedSSL3Fallback, | 240 registry->RegisterBooleanPref(prefs::kEnableUnrestrictedSSL3Fallback, |
241 true /* default_config.unrestricted_ssl3_fallback_enabled */); | 241 true /* default_config.unrestricted_ssl3_fallback_enabled */); |
242 registry->RegisterListPref(prefs::kCipherSuiteBlacklist); | 242 registry->RegisterListPref(prefs::kCipherSuiteBlacklist); |
243 } | 243 } |
244 | 244 |
245 net::SSLConfigService* SSLConfigServiceManagerPref::Get() { | 245 net::SSLConfigService* SSLConfigServiceManagerPref::Get() { |
246 return ssl_config_service_; | 246 return ssl_config_service_.get(); |
247 } | 247 } |
248 | 248 |
249 void SSLConfigServiceManagerPref::OnPreferenceChanged( | 249 void SSLConfigServiceManagerPref::OnPreferenceChanged( |
250 PrefService* prefs, | 250 PrefService* prefs, |
251 const std::string& pref_name_in) { | 251 const std::string& pref_name_in) { |
252 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 252 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
253 DCHECK(prefs); | 253 DCHECK(prefs); |
254 if (pref_name_in == prefs::kCipherSuiteBlacklist) | 254 if (pref_name_in == prefs::kCipherSuiteBlacklist) |
255 OnDisabledCipherSuitesChange(prefs); | 255 OnDisabledCipherSuitesChange(prefs); |
256 | 256 |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
312 // static | 312 // static |
313 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager( | 313 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager( |
314 PrefService* local_state) { | 314 PrefService* local_state) { |
315 return new SSLConfigServiceManagerPref(local_state); | 315 return new SSLConfigServiceManagerPref(local_state); |
316 } | 316 } |
317 | 317 |
318 // static | 318 // static |
319 void SSLConfigServiceManager::RegisterPrefs(PrefRegistrySimple* registry) { | 319 void SSLConfigServiceManager::RegisterPrefs(PrefRegistrySimple* registry) { |
320 SSLConfigServiceManagerPref::RegisterPrefs(registry); | 320 SSLConfigServiceManagerPref::RegisterPrefs(registry); |
321 } | 321 } |
OLD | NEW |