Chromium Code Reviews| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 47 #include "chrome/browser/net/predictor.h" | 47 #include "chrome/browser/net/predictor.h" |
| 48 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" | 48 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" |
| 49 #include "chrome/browser/net/ssl_config_service_manager.h" | 49 #include "chrome/browser/net/ssl_config_service_manager.h" |
| 50 #include "chrome/browser/network_time/network_time_service.h" | 50 #include "chrome/browser/network_time/network_time_service.h" |
| 51 #include "chrome/browser/notifications/desktop_notification_service.h" | 51 #include "chrome/browser/notifications/desktop_notification_service.h" |
| 52 #include "chrome/browser/notifications/notification_prefs_manager.h" | 52 #include "chrome/browser/notifications/notification_prefs_manager.h" |
| 53 #include "chrome/browser/password_manager/password_manager.h" | 53 #include "chrome/browser/password_manager/password_manager.h" |
| 54 #include "chrome/browser/pepper_flash_settings_manager.h" | 54 #include "chrome/browser/pepper_flash_settings_manager.h" |
| 55 #include "chrome/browser/plugins/plugin_finder.h" | 55 #include "chrome/browser/plugins/plugin_finder.h" |
| 56 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 56 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| 57 #include "chrome/browser/prefs/pref_hash_filter.h" | |
| 57 #include "chrome/browser/prefs/pref_hash_store_impl.h" | 58 #include "chrome/browser/prefs/pref_hash_store_impl.h" |
| 58 #include "chrome/browser/prefs/pref_service_syncable.h" | 59 #include "chrome/browser/prefs/pref_service_syncable.h" |
| 59 #include "chrome/browser/prefs/session_startup_pref.h" | 60 #include "chrome/browser/prefs/session_startup_pref.h" |
| 60 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" | 61 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" |
| 61 #include "chrome/browser/printing/print_dialog_cloud.h" | 62 #include "chrome/browser/printing/print_dialog_cloud.h" |
| 62 #include "chrome/browser/profiles/chrome_version_service.h" | 63 #include "chrome/browser/profiles/chrome_version_service.h" |
| 63 #include "chrome/browser/profiles/profile.h" | 64 #include "chrome/browser/profiles/profile.h" |
| 64 #include "chrome/browser/profiles/profile_impl.h" | 65 #include "chrome/browser/profiles/profile_impl.h" |
| 65 #include "chrome/browser/profiles/profile_info_cache.h" | 66 #include "chrome/browser/profiles/profile_info_cache.h" |
| 66 #include "chrome/browser/profiles/profiles_state.h" | 67 #include "chrome/browser/profiles/profiles_state.h" |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 231 FlagsUI::RegisterPrefs(registry); | 232 FlagsUI::RegisterPrefs(registry); |
| 232 geolocation::RegisterPrefs(registry); | 233 geolocation::RegisterPrefs(registry); |
| 233 GLStringManager::RegisterPrefs(registry); | 234 GLStringManager::RegisterPrefs(registry); |
| 234 GpuModeManager::RegisterPrefs(registry); | 235 GpuModeManager::RegisterPrefs(registry); |
| 235 IntranetRedirectDetector::RegisterPrefs(registry); | 236 IntranetRedirectDetector::RegisterPrefs(registry); |
| 236 IOThread::RegisterPrefs(registry); | 237 IOThread::RegisterPrefs(registry); |
| 237 KeywordEditorController::RegisterPrefs(registry); | 238 KeywordEditorController::RegisterPrefs(registry); |
| 238 MetricsLog::RegisterPrefs(registry); | 239 MetricsLog::RegisterPrefs(registry); |
| 239 MetricsService::RegisterPrefs(registry); | 240 MetricsService::RegisterPrefs(registry); |
| 240 metrics::CachingPermutedEntropyProvider::RegisterPrefs(registry); | 241 metrics::CachingPermutedEntropyProvider::RegisterPrefs(registry); |
| 242 PrefHashFilter::RegisterPrefs(registry); | |
|
erikwright (departed)
2014/02/06 20:04:03
I'd consider having a single call to chrome_prefs:
robertshield
2014/02/07 04:36:19
Done.
| |
| 241 PrefHashStoreImpl::RegisterPrefs(registry); | 243 PrefHashStoreImpl::RegisterPrefs(registry); |
| 242 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); | 244 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); |
| 243 ProfileInfoCache::RegisterPrefs(registry); | 245 ProfileInfoCache::RegisterPrefs(registry); |
| 244 profiles::RegisterPrefs(registry); | 246 profiles::RegisterPrefs(registry); |
| 245 PromoResourceService::RegisterPrefs(registry); | 247 PromoResourceService::RegisterPrefs(registry); |
| 246 RegisterScreenshotPrefs(registry); | 248 RegisterScreenshotPrefs(registry); |
| 247 SigninManagerFactory::RegisterPrefs(registry); | 249 SigninManagerFactory::RegisterPrefs(registry); |
| 248 SSLConfigServiceManager::RegisterPrefs(registry); | 250 SSLConfigServiceManager::RegisterPrefs(registry); |
| 249 UpgradeDetector::RegisterPrefs(registry); | 251 UpgradeDetector::RegisterPrefs(registry); |
| 250 WebCacheManager::RegisterPrefs(registry); | 252 WebCacheManager::RegisterPrefs(registry); |
| (...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 571 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 573 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 572 current_version); | 574 current_version); |
| 573 } | 575 } |
| 574 | 576 |
| 575 #if defined(OS_CHROMEOS) | 577 #if defined(OS_CHROMEOS) |
| 576 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 578 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
| 577 #endif | 579 #endif |
| 578 } | 580 } |
| 579 | 581 |
| 580 } // namespace chrome | 582 } // namespace chrome |
| OLD | NEW |