OLD | NEW |
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 "apps/prefs.h" | 7 #include "apps/prefs.h" |
8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
9 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 20 matching lines...) Expand all Loading... |
31 #include "chrome/browser/geolocation/geolocation_prefs.h" | 31 #include "chrome/browser/geolocation/geolocation_prefs.h" |
32 #include "chrome/browser/google/google_url_tracker.h" | 32 #include "chrome/browser/google/google_url_tracker.h" |
33 #include "chrome/browser/google/google_url_tracker_factory.h" | 33 #include "chrome/browser/google/google_url_tracker_factory.h" |
34 #include "chrome/browser/gpu/gl_string_manager.h" | 34 #include "chrome/browser/gpu/gl_string_manager.h" |
35 #include "chrome/browser/gpu/gpu_mode_manager.h" | 35 #include "chrome/browser/gpu/gpu_mode_manager.h" |
36 #include "chrome/browser/intranet_redirect_detector.h" | 36 #include "chrome/browser/intranet_redirect_detector.h" |
37 #include "chrome/browser/io_thread.h" | 37 #include "chrome/browser/io_thread.h" |
38 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 38 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
39 #include "chrome/browser/media/media_device_id_salt.h" | 39 #include "chrome/browser/media/media_device_id_salt.h" |
40 #include "chrome/browser/media/media_stream_devices_controller.h" | 40 #include "chrome/browser/media/media_stream_devices_controller.h" |
41 #include "chrome/browser/metrics/metrics_service.h" | 41 #include "chrome/browser/metrics/chrome_metrics_service_client.h" |
42 #include "chrome/browser/metrics/variations/variations_service.h" | 42 #include "chrome/browser/metrics/variations/variations_service.h" |
43 #include "chrome/browser/net/http_server_properties_manager.h" | 43 #include "chrome/browser/net/http_server_properties_manager.h" |
44 #include "chrome/browser/net/net_pref_observer.h" | 44 #include "chrome/browser/net/net_pref_observer.h" |
45 #include "chrome/browser/net/predictor.h" | 45 #include "chrome/browser/net/predictor.h" |
46 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" | 46 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" |
47 #include "chrome/browser/net/ssl_config_service_manager.h" | 47 #include "chrome/browser/net/ssl_config_service_manager.h" |
48 #include "chrome/browser/network_time/network_time_tracker.h" | 48 #include "chrome/browser/network_time/network_time_tracker.h" |
49 #include "chrome/browser/notifications/desktop_notification_service.h" | 49 #include "chrome/browser/notifications/desktop_notification_service.h" |
50 #include "chrome/browser/notifications/message_center_notification_manager.h" | 50 #include "chrome/browser/notifications/message_center_notification_manager.h" |
51 #include "chrome/browser/pepper_flash_settings_manager.h" | 51 #include "chrome/browser/pepper_flash_settings_manager.h" |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
215 namespace chrome { | 215 namespace chrome { |
216 | 216 |
217 void RegisterLocalState(PrefRegistrySimple* registry) { | 217 void RegisterLocalState(PrefRegistrySimple* registry) { |
218 // Prefs in Local State. | 218 // Prefs in Local State. |
219 registry->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); | 219 registry->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); |
220 | 220 |
221 // Please keep this list alphabetized. | 221 // Please keep this list alphabetized. |
222 AppListService::RegisterPrefs(registry); | 222 AppListService::RegisterPrefs(registry); |
223 browser_shutdown::RegisterPrefs(registry); | 223 browser_shutdown::RegisterPrefs(registry); |
224 BrowserProcessImpl::RegisterPrefs(registry); | 224 BrowserProcessImpl::RegisterPrefs(registry); |
| 225 ChromeMetricsServiceClient::RegisterPrefs(registry); |
225 chrome_prefs::RegisterPrefs(registry); | 226 chrome_prefs::RegisterPrefs(registry); |
226 chrome_variations::VariationsService::RegisterPrefs(registry); | 227 chrome_variations::VariationsService::RegisterPrefs(registry); |
227 component_updater::RegisterPrefsForRecoveryComponent(registry); | 228 component_updater::RegisterPrefsForRecoveryComponent(registry); |
228 ExternalProtocolHandler::RegisterPrefs(registry); | 229 ExternalProtocolHandler::RegisterPrefs(registry); |
229 FlagsUI::RegisterPrefs(registry); | 230 FlagsUI::RegisterPrefs(registry); |
230 geolocation::RegisterPrefs(registry); | 231 geolocation::RegisterPrefs(registry); |
231 GLStringManager::RegisterPrefs(registry); | 232 GLStringManager::RegisterPrefs(registry); |
232 GpuModeManager::RegisterPrefs(registry); | 233 GpuModeManager::RegisterPrefs(registry); |
233 IntranetRedirectDetector::RegisterPrefs(registry); | 234 IntranetRedirectDetector::RegisterPrefs(registry); |
234 IOThread::RegisterPrefs(registry); | 235 IOThread::RegisterPrefs(registry); |
235 KeywordEditorController::RegisterPrefs(registry); | 236 KeywordEditorController::RegisterPrefs(registry); |
236 MetricsService::RegisterPrefs(registry); | |
237 NetworkTimeTracker::RegisterPrefs(registry); | 237 NetworkTimeTracker::RegisterPrefs(registry); |
238 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); | 238 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); |
239 ProfileInfoCache::RegisterPrefs(registry); | 239 ProfileInfoCache::RegisterPrefs(registry); |
240 profiles::RegisterPrefs(registry); | 240 profiles::RegisterPrefs(registry); |
241 PromoResourceService::RegisterPrefs(registry); | 241 PromoResourceService::RegisterPrefs(registry); |
242 rappor::RapporService::RegisterPrefs(registry); | 242 rappor::RapporService::RegisterPrefs(registry); |
243 RegisterScreenshotPrefs(registry); | 243 RegisterScreenshotPrefs(registry); |
244 SigninManagerFactory::RegisterPrefs(registry); | 244 SigninManagerFactory::RegisterPrefs(registry); |
245 SSLConfigServiceManager::RegisterPrefs(registry); | 245 SSLConfigServiceManager::RegisterPrefs(registry); |
246 UpgradeDetector::RegisterPrefs(registry); | 246 UpgradeDetector::RegisterPrefs(registry); |
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
577 #if defined(OS_CHROMEOS) | 577 #if defined(OS_CHROMEOS) |
578 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 578 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
579 #endif | 579 #endif |
580 | 580 |
581 #if defined(TOOLKIT_VIEWS) | 581 #if defined(TOOLKIT_VIEWS) |
582 MigrateBrowserTabStripPrefs(local_state); | 582 MigrateBrowserTabStripPrefs(local_state); |
583 #endif | 583 #endif |
584 } | 584 } |
585 | 585 |
586 } // namespace chrome | 586 } // namespace chrome |
OLD | NEW |