OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 void SetNewSSLConfig(const net::SSLConfig& new_config); | 86 void SetNewSSLConfig(const net::SSLConfig& new_config); |
87 | 87 |
88 // Cached value of prefs, should only be accessed from IO thread. | 88 // Cached value of prefs, should only be accessed from IO thread. |
89 net::SSLConfig cached_config_; | 89 net::SSLConfig cached_config_; |
90 | 90 |
91 DISALLOW_COPY_AND_ASSIGN(SSLConfigServicePref); | 91 DISALLOW_COPY_AND_ASSIGN(SSLConfigServicePref); |
92 }; | 92 }; |
93 | 93 |
94 void SSLConfigServicePref::GetSSLConfig(net::SSLConfig* config) { | 94 void SSLConfigServicePref::GetSSLConfig(net::SSLConfig* config) { |
95 *config = cached_config_; | 95 *config = cached_config_; |
| 96 config->crl_set = GetCRLSet(); |
96 } | 97 } |
97 | 98 |
98 void SSLConfigServicePref::SetNewSSLConfig( | 99 void SSLConfigServicePref::SetNewSSLConfig( |
99 const net::SSLConfig& new_config) { | 100 const net::SSLConfig& new_config) { |
100 net::SSLConfig orig_config = cached_config_; | 101 net::SSLConfig orig_config = cached_config_; |
101 cached_config_ = new_config; | 102 cached_config_ = new_config; |
102 ProcessConfigUpdate(orig_config, new_config); | 103 ProcessConfigUpdate(orig_config, new_config); |
103 } | 104 } |
104 | 105 |
105 //////////////////////////////////////////////////////////////////////////////// | 106 //////////////////////////////////////////////////////////////////////////////// |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 // static | 227 // static |
227 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager( | 228 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager( |
228 PrefService* local_state) { | 229 PrefService* local_state) { |
229 return new SSLConfigServiceManagerPref(local_state); | 230 return new SSLConfigServiceManagerPref(local_state); |
230 } | 231 } |
231 | 232 |
232 // static | 233 // static |
233 void SSLConfigServiceManager::RegisterPrefs(PrefService* prefs) { | 234 void SSLConfigServiceManager::RegisterPrefs(PrefService* prefs) { |
234 SSLConfigServiceManagerPref::RegisterPrefs(prefs); | 235 SSLConfigServiceManagerPref::RegisterPrefs(prefs); |
235 } | 236 } |
OLD | NEW |