Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Side by Side Diff: chrome/browser/net/ssl_config_service_manager_pref.cc

Issue 541813002: Componentize chrome/common/content_settings files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: GN fix Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_change_registrar.h" 12 #include "base/prefs/pref_change_registrar.h"
13 #include "base/prefs/pref_member.h" 13 #include "base/prefs/pref_member.h"
14 #include "base/prefs/pref_registry_simple.h" 14 #include "base/prefs/pref_registry_simple.h"
15 #include "base/prefs/pref_service.h" 15 #include "base/prefs/pref_service.h"
16 #include "chrome/browser/chrome_notification_types.h" 16 #include "chrome/browser/chrome_notification_types.h"
17 #include "chrome/browser/content_settings/content_settings_utils.h" 17 #include "chrome/browser/content_settings/content_settings_utils.h"
18 #include "chrome/common/content_settings.h"
19 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
19 #include "components/content_settings/core/common/content_settings.h"
20 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
21 #include "net/ssl/ssl_cipher_suite_names.h" 21 #include "net/ssl/ssl_cipher_suite_names.h"
22 #include "net/ssl/ssl_config_service.h" 22 #include "net/ssl/ssl_config_service.h"
23 23
24 using content::BrowserThread; 24 using content::BrowserThread;
25 25
26 namespace { 26 namespace {
27 27
28 // Converts a ListValue of StringValues into a vector of strings. Any Values 28 // Converts a ListValue of StringValues into a vector of strings. Any Values
29 // which cannot be converted will be skipped. 29 // which cannot be converted will be skipped.
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 // static 311 // static
312 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager( 312 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager(
313 PrefService* local_state) { 313 PrefService* local_state) {
314 return new SSLConfigServiceManagerPref(local_state); 314 return new SSLConfigServiceManagerPref(local_state);
315 } 315 }
316 316
317 // static 317 // static
318 void SSLConfigServiceManager::RegisterPrefs(PrefRegistrySimple* registry) { 318 void SSLConfigServiceManager::RegisterPrefs(PrefRegistrySimple* registry) {
319 SSLConfigServiceManagerPref::RegisterPrefs(registry); 319 SSLConfigServiceManagerPref::RegisterPrefs(registry);
320 } 320 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698