| 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 | 65 |
| 66 //////////////////////////////////////////////////////////////////////////////// | 66 //////////////////////////////////////////////////////////////////////////////// |
| 67 // SSLConfigServicePref | 67 // SSLConfigServicePref |
| 68 | 68 |
| 69 // An SSLConfigService which stores a cached version of the current SSLConfig | 69 // An SSLConfigService which stores a cached version of the current SSLConfig |
| 70 // prefs, which are updated by SSLConfigServiceManagerPref when the prefs | 70 // prefs, which are updated by SSLConfigServiceManagerPref when the prefs |
| 71 // change. | 71 // change. |
| 72 class SSLConfigServicePref : public net::SSLConfigService { | 72 class SSLConfigServicePref : public net::SSLConfigService { |
| 73 public: | 73 public: |
| 74 SSLConfigServicePref() {} | 74 SSLConfigServicePref() {} |
| 75 virtual ~SSLConfigServicePref() {} | |
| 76 | 75 |
| 77 // Store SSL config settings in |config|. Must only be called from IO thread. | 76 // Store SSL config settings in |config|. Must only be called from IO thread. |
| 78 virtual void GetSSLConfig(net::SSLConfig* config); | 77 virtual void GetSSLConfig(net::SSLConfig* config); |
| 79 | 78 |
| 80 private: | 79 private: |
| 81 // Allow the pref watcher to update our internal state. | 80 // Allow the pref watcher to update our internal state. |
| 82 friend class SSLConfigServiceManagerPref; | 81 friend class SSLConfigServiceManagerPref; |
| 83 | 82 |
| 83 virtual ~SSLConfigServicePref() {} |
| 84 |
| 84 // This method is posted to the IO thread from the browser thread to carry the | 85 // This method is posted to the IO thread from the browser thread to carry the |
| 85 // new config information. | 86 // new config information. |
| 86 void SetNewSSLConfig(const net::SSLConfig& new_config); | 87 void SetNewSSLConfig(const net::SSLConfig& new_config); |
| 87 | 88 |
| 88 // Cached value of prefs, should only be accessed from IO thread. | 89 // Cached value of prefs, should only be accessed from IO thread. |
| 89 net::SSLConfig cached_config_; | 90 net::SSLConfig cached_config_; |
| 90 | 91 |
| 91 DISALLOW_COPY_AND_ASSIGN(SSLConfigServicePref); | 92 DISALLOW_COPY_AND_ASSIGN(SSLConfigServicePref); |
| 92 }; | 93 }; |
| 93 | 94 |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 // static | 249 // static |
| 249 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager( | 250 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager( |
| 250 PrefService* local_state) { | 251 PrefService* local_state) { |
| 251 return new SSLConfigServiceManagerPref(local_state); | 252 return new SSLConfigServiceManagerPref(local_state); |
| 252 } | 253 } |
| 253 | 254 |
| 254 // static | 255 // static |
| 255 void SSLConfigServiceManager::RegisterPrefs(PrefService* prefs) { | 256 void SSLConfigServiceManager::RegisterPrefs(PrefService* prefs) { |
| 256 SSLConfigServiceManagerPref::RegisterPrefs(prefs); | 257 SSLConfigServiceManagerPref::RegisterPrefs(prefs); |
| 257 } | 258 } |
| OLD | NEW |