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" |
11 #include "base/bind.h" | 11 #include "base/bind.h" |
| 12 #include "base/prefs/pref_registry_simple.h" |
| 13 #include "base/prefs/pref_service.h" |
12 #include "base/prefs/public/pref_change_registrar.h" | 14 #include "base/prefs/public/pref_change_registrar.h" |
13 #include "base/prefs/public/pref_member.h" | 15 #include "base/prefs/public/pref_member.h" |
14 #include "chrome/browser/content_settings/content_settings_utils.h" | 16 #include "chrome/browser/content_settings/content_settings_utils.h" |
15 #include "chrome/browser/prefs/pref_registry_simple.h" | |
16 #include "chrome/browser/prefs/pref_service.h" | |
17 #include "chrome/common/chrome_notification_types.h" | 17 #include "chrome/common/chrome_notification_types.h" |
18 #include "chrome/common/content_settings.h" | 18 #include "chrome/common/content_settings.h" |
19 #include "chrome/common/pref_names.h" | 19 #include "chrome/common/pref_names.h" |
20 #include "content/public/browser/browser_thread.h" | 20 #include "content/public/browser/browser_thread.h" |
21 #include "net/base/ssl_cipher_suite_names.h" | 21 #include "net/base/ssl_cipher_suite_names.h" |
22 #include "net/base/ssl_config_service.h" | 22 #include "net/base/ssl_config_service.h" |
23 | 23 |
24 using content::BrowserThread; | 24 using content::BrowserThread; |
25 | 25 |
26 namespace { | 26 namespace { |
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
349 // static | 349 // static |
350 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager( | 350 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager( |
351 PrefService* local_state, PrefService* user_prefs) { | 351 PrefService* local_state, PrefService* user_prefs) { |
352 return new SSLConfigServiceManagerPref(local_state, user_prefs); | 352 return new SSLConfigServiceManagerPref(local_state, user_prefs); |
353 } | 353 } |
354 | 354 |
355 // static | 355 // static |
356 void SSLConfigServiceManager::RegisterPrefs(PrefRegistrySimple* registry) { | 356 void SSLConfigServiceManager::RegisterPrefs(PrefRegistrySimple* registry) { |
357 SSLConfigServiceManagerPref::RegisterPrefs(registry); | 357 SSLConfigServiceManagerPref::RegisterPrefs(registry); |
358 } | 358 } |
OLD | NEW |