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

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 1320533007: Componentize ssl_config_service_manager_pref.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed pref_service_mock_factory.h dependency from unittest Created 5 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 4
5 #include "chrome/browser/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/metrics/histogram_macros.h" 9 #include "base/metrics/histogram_macros.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 17 matching lines...) Expand all
28 #include "chrome/browser/intranet_redirect_detector.h" 28 #include "chrome/browser/intranet_redirect_detector.h"
29 #include "chrome/browser/io_thread.h" 29 #include "chrome/browser/io_thread.h"
30 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 30 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
31 #include "chrome/browser/media/media_device_id_salt.h" 31 #include "chrome/browser/media/media_device_id_salt.h"
32 #include "chrome/browser/media/media_stream_devices_controller.h" 32 #include "chrome/browser/media/media_stream_devices_controller.h"
33 #include "chrome/browser/metrics/chrome_metrics_service_client.h" 33 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
34 #include "chrome/browser/net/http_server_properties_manager_factory.h" 34 #include "chrome/browser/net/http_server_properties_manager_factory.h"
35 #include "chrome/browser/net/net_pref_observer.h" 35 #include "chrome/browser/net/net_pref_observer.h"
36 #include "chrome/browser/net/prediction_options.h" 36 #include "chrome/browser/net/prediction_options.h"
37 #include "chrome/browser/net/predictor.h" 37 #include "chrome/browser/net/predictor.h"
38 #include "chrome/browser/net/ssl_config_service_manager.h"
39 #include "chrome/browser/notifications/extension_welcome_notification.h" 38 #include "chrome/browser/notifications/extension_welcome_notification.h"
40 #include "chrome/browser/notifications/message_center_notification_manager.h" 39 #include "chrome/browser/notifications/message_center_notification_manager.h"
41 #include "chrome/browser/notifications/notifier_state_tracker.h" 40 #include "chrome/browser/notifications/notifier_state_tracker.h"
42 #include "chrome/browser/pepper_flash_settings_manager.h" 41 #include "chrome/browser/pepper_flash_settings_manager.h"
43 #include "chrome/browser/plugins/plugin_finder.h" 42 #include "chrome/browser/plugins/plugin_finder.h"
44 #include "chrome/browser/prefs/chrome_pref_service_factory.h" 43 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
45 #include "chrome/browser/prefs/incognito_mode_prefs.h" 44 #include "chrome/browser/prefs/incognito_mode_prefs.h"
46 #include "chrome/browser/prefs/pref_service_syncable.h" 45 #include "chrome/browser/prefs/pref_service_syncable.h"
47 #include "chrome/browser/prefs/session_startup_pref.h" 46 #include "chrome/browser/prefs/session_startup_pref.h"
48 #include "chrome/browser/profiles/chrome_version_service.h" 47 #include "chrome/browser/profiles/chrome_version_service.h"
(...skipping 29 matching lines...) Expand all
78 #include "components/dom_distiller/core/distilled_page_prefs.h" 77 #include "components/dom_distiller/core/distilled_page_prefs.h"
79 #include "components/enhanced_bookmarks/bookmark_server_cluster_service.h" 78 #include "components/enhanced_bookmarks/bookmark_server_cluster_service.h"
80 #include "components/gcm_driver/gcm_channel_status_syncer.h" 79 #include "components/gcm_driver/gcm_channel_status_syncer.h"
81 #include "components/network_time/network_time_tracker.h" 80 #include "components/network_time/network_time_tracker.h"
82 #include "components/omnibox/browser/zero_suggest_provider.h" 81 #include "components/omnibox/browser/zero_suggest_provider.h"
83 #include "components/password_manager/core/browser/password_manager.h" 82 #include "components/password_manager/core/browser/password_manager.h"
84 #include "components/pref_registry/pref_registry_syncable.h" 83 #include "components/pref_registry/pref_registry_syncable.h"
85 #include "components/proxy_config/pref_proxy_config_tracker_impl.h" 84 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
86 #include "components/rappor/rappor_service.h" 85 #include "components/rappor/rappor_service.h"
87 #include "components/search_engines/template_url_prepopulate_data.h" 86 #include "components/search_engines/template_url_prepopulate_data.h"
87 #include "components/ssl_config/ssl_config_service_manager.h"
88 #include "components/sync_driver/sync_prefs.h" 88 #include "components/sync_driver/sync_prefs.h"
89 #include "components/translate/core/browser/translate_prefs.h" 89 #include "components/translate/core/browser/translate_prefs.h"
90 #include "components/variations/service/variations_service.h" 90 #include "components/variations/service/variations_service.h"
91 #include "components/web_resource/promo_resource_service.h" 91 #include "components/web_resource/promo_resource_service.h"
92 #include "content/public/browser/render_process_host.h" 92 #include "content/public/browser/render_process_host.h"
93 #include "net/http/http_server_properties_manager.h" 93 #include "net/http/http_server_properties_manager.h"
94 94
95 #if defined(ENABLE_AUTOFILL_DIALOG) 95 #if defined(ENABLE_AUTOFILL_DIALOG)
96 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h" 96 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
97 #endif 97 #endif
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 GpuModeManager::RegisterPrefs(registry); 254 GpuModeManager::RegisterPrefs(registry);
255 IntranetRedirectDetector::RegisterPrefs(registry); 255 IntranetRedirectDetector::RegisterPrefs(registry);
256 IOThread::RegisterPrefs(registry); 256 IOThread::RegisterPrefs(registry);
257 network_time::NetworkTimeTracker::RegisterPrefs(registry); 257 network_time::NetworkTimeTracker::RegisterPrefs(registry);
258 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); 258 PrefProxyConfigTrackerImpl::RegisterPrefs(registry);
259 ProfileInfoCache::RegisterPrefs(registry); 259 ProfileInfoCache::RegisterPrefs(registry);
260 profiles::RegisterPrefs(registry); 260 profiles::RegisterPrefs(registry);
261 rappor::RapporService::RegisterPrefs(registry); 261 rappor::RapporService::RegisterPrefs(registry);
262 RegisterScreenshotPrefs(registry); 262 RegisterScreenshotPrefs(registry);
263 SigninManagerFactory::RegisterPrefs(registry); 263 SigninManagerFactory::RegisterPrefs(registry);
264 SSLConfigServiceManager::RegisterPrefs(registry); 264 ssl_config::SSLConfigServiceManager::RegisterPrefs(registry);
265 UpgradeDetector::RegisterPrefs(registry); 265 UpgradeDetector::RegisterPrefs(registry);
266 web_resource::PromoResourceService::RegisterPrefs(registry); 266 web_resource::PromoResourceService::RegisterPrefs(registry);
267 267
268 #if defined(ENABLE_AUTOFILL_DIALOG) 268 #if defined(ENABLE_AUTOFILL_DIALOG)
269 autofill::AutofillDialogController::RegisterPrefs(registry); 269 autofill::AutofillDialogController::RegisterPrefs(registry);
270 #endif 270 #endif
271 271
272 #if defined(ENABLE_CONFIGURATION_POLICY) 272 #if defined(ENABLE_CONFIGURATION_POLICY)
273 policy::BrowserPolicyConnector::RegisterPrefs(registry); 273 policy::BrowserPolicyConnector::RegisterPrefs(registry);
274 policy::PolicyStatisticsCollector::RegisterPrefs(registry); 274 policy::PolicyStatisticsCollector::RegisterPrefs(registry);
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 chrome_browser_net::MigrateNetworkPredictionUserPrefs(profile_prefs); 571 chrome_browser_net::MigrateNetworkPredictionUserPrefs(profile_prefs);
572 #endif 572 #endif
573 573
574 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) 574 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST)
575 // Added 02/2015. 575 // Added 02/2015.
576 MigrateGoogleNowPrefs(profile); 576 MigrateGoogleNowPrefs(profile);
577 #endif 577 #endif
578 } 578 }
579 579
580 } // namespace chrome 580 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698