| 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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 | 219 |
| 220 void RegisterLocalState(PrefRegistrySimple* registry) { | 220 void RegisterLocalState(PrefRegistrySimple* registry) { |
| 221 // Prefs in Local State. | 221 // Prefs in Local State. |
| 222 registry->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); | 222 registry->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); |
| 223 | 223 |
| 224 // Please keep this list alphabetized. | 224 // Please keep this list alphabetized. |
| 225 AppListService::RegisterPrefs(registry); | 225 AppListService::RegisterPrefs(registry); |
| 226 browser_shutdown::RegisterPrefs(registry); | 226 browser_shutdown::RegisterPrefs(registry); |
| 227 BrowserProcessImpl::RegisterPrefs(registry); | 227 BrowserProcessImpl::RegisterPrefs(registry); |
| 228 chrome_variations::VariationsService::RegisterPrefs(registry); | 228 chrome_variations::VariationsService::RegisterPrefs(registry); |
| 229 component_updater::RegisterPrefsForRecoveryComponent(registry); |
| 229 ExternalProtocolHandler::RegisterPrefs(registry); | 230 ExternalProtocolHandler::RegisterPrefs(registry); |
| 230 FlagsUI::RegisterPrefs(registry); | 231 FlagsUI::RegisterPrefs(registry); |
| 231 geolocation::RegisterPrefs(registry); | 232 geolocation::RegisterPrefs(registry); |
| 232 GLStringManager::RegisterPrefs(registry); | 233 GLStringManager::RegisterPrefs(registry); |
| 233 GpuModeManager::RegisterPrefs(registry); | 234 GpuModeManager::RegisterPrefs(registry); |
| 234 IntranetRedirectDetector::RegisterPrefs(registry); | 235 IntranetRedirectDetector::RegisterPrefs(registry); |
| 235 IOThread::RegisterPrefs(registry); | 236 IOThread::RegisterPrefs(registry); |
| 236 KeywordEditorController::RegisterPrefs(registry); | 237 KeywordEditorController::RegisterPrefs(registry); |
| 237 MetricsLog::RegisterPrefs(registry); | 238 MetricsLog::RegisterPrefs(registry); |
| 238 MetricsService::RegisterPrefs(registry); | 239 MetricsService::RegisterPrefs(registry); |
| 239 metrics::CachingPermutedEntropyProvider::RegisterPrefs(registry); | 240 metrics::CachingPermutedEntropyProvider::RegisterPrefs(registry); |
| 240 PrefHashStoreImpl::RegisterPrefs(registry); | 241 PrefHashStoreImpl::RegisterPrefs(registry); |
| 241 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); | 242 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); |
| 242 ProfileInfoCache::RegisterPrefs(registry); | 243 ProfileInfoCache::RegisterPrefs(registry); |
| 243 profiles::RegisterPrefs(registry); | 244 profiles::RegisterPrefs(registry); |
| 244 PromoResourceService::RegisterPrefs(registry); | 245 PromoResourceService::RegisterPrefs(registry); |
| 245 RegisterPrefsForRecoveryComponent(registry); | |
| 246 RegisterScreenshotPrefs(registry); | 246 RegisterScreenshotPrefs(registry); |
| 247 SigninManagerFactory::RegisterPrefs(registry); | 247 SigninManagerFactory::RegisterPrefs(registry); |
| 248 SSLConfigServiceManager::RegisterPrefs(registry); | 248 SSLConfigServiceManager::RegisterPrefs(registry); |
| 249 UpgradeDetector::RegisterPrefs(registry); | 249 UpgradeDetector::RegisterPrefs(registry); |
| 250 WebCacheManager::RegisterPrefs(registry); | 250 WebCacheManager::RegisterPrefs(registry); |
| 251 | 251 |
| 252 #if defined(ENABLE_AUTOFILL_DIALOG) | 252 #if defined(ENABLE_AUTOFILL_DIALOG) |
| 253 autofill::AutofillDialogController::RegisterPrefs(registry); | 253 autofill::AutofillDialogController::RegisterPrefs(registry); |
| 254 #endif | 254 #endif |
| 255 | 255 |
| (...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 566 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 566 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 567 current_version); | 567 current_version); |
| 568 } | 568 } |
| 569 | 569 |
| 570 #if defined(OS_CHROMEOS) | 570 #if defined(OS_CHROMEOS) |
| 571 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 571 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
| 572 #endif | 572 #endif |
| 573 } | 573 } |
| 574 | 574 |
| 575 } // namespace chrome | 575 } // namespace chrome |
| OLD | NEW |