| 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 #include "chrome/browser/net/net_pref_observer.h" | 45 #include "chrome/browser/net/net_pref_observer.h" |
| 46 #include "chrome/browser/net/predictor.h" | 46 #include "chrome/browser/net/predictor.h" |
| 47 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" | 47 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" |
| 48 #include "chrome/browser/net/ssl_config_service_manager.h" | 48 #include "chrome/browser/net/ssl_config_service_manager.h" |
| 49 #include "chrome/browser/network_time/network_time_service.h" | 49 #include "chrome/browser/network_time/network_time_service.h" |
| 50 #include "chrome/browser/notifications/desktop_notification_service.h" | 50 #include "chrome/browser/notifications/desktop_notification_service.h" |
| 51 #include "chrome/browser/notifications/notification_prefs_manager.h" | 51 #include "chrome/browser/notifications/notification_prefs_manager.h" |
| 52 #include "chrome/browser/password_manager/password_manager.h" | 52 #include "chrome/browser/password_manager/password_manager.h" |
| 53 #include "chrome/browser/pepper_flash_settings_manager.h" | 53 #include "chrome/browser/pepper_flash_settings_manager.h" |
| 54 #include "chrome/browser/plugins/plugin_finder.h" | 54 #include "chrome/browser/plugins/plugin_finder.h" |
| 55 #include "chrome/browser/prefs/chrome_pref_service_factory.h" |
| 55 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 56 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| 56 #include "chrome/browser/prefs/pref_hash_store_impl.h" | |
| 57 #include "chrome/browser/prefs/pref_service_syncable.h" | 57 #include "chrome/browser/prefs/pref_service_syncable.h" |
| 58 #include "chrome/browser/prefs/session_startup_pref.h" | 58 #include "chrome/browser/prefs/session_startup_pref.h" |
| 59 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" | 59 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" |
| 60 #include "chrome/browser/printing/print_dialog_cloud.h" | 60 #include "chrome/browser/printing/print_dialog_cloud.h" |
| 61 #include "chrome/browser/profiles/chrome_version_service.h" | 61 #include "chrome/browser/profiles/chrome_version_service.h" |
| 62 #include "chrome/browser/profiles/profile.h" | 62 #include "chrome/browser/profiles/profile.h" |
| 63 #include "chrome/browser/profiles/profile_impl.h" | 63 #include "chrome/browser/profiles/profile_impl.h" |
| 64 #include "chrome/browser/profiles/profile_info_cache.h" | 64 #include "chrome/browser/profiles/profile_info_cache.h" |
| 65 #include "chrome/browser/profiles/profiles_state.h" | 65 #include "chrome/browser/profiles/profiles_state.h" |
| 66 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" | 66 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 namespace chrome { | 217 namespace chrome { |
| 218 | 218 |
| 219 void RegisterLocalState(PrefRegistrySimple* registry) { | 219 void RegisterLocalState(PrefRegistrySimple* registry) { |
| 220 // Prefs in Local State. | 220 // Prefs in Local State. |
| 221 registry->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); | 221 registry->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); |
| 222 | 222 |
| 223 // Please keep this list alphabetized. | 223 // Please keep this list alphabetized. |
| 224 AppListService::RegisterPrefs(registry); | 224 AppListService::RegisterPrefs(registry); |
| 225 browser_shutdown::RegisterPrefs(registry); | 225 browser_shutdown::RegisterPrefs(registry); |
| 226 BrowserProcessImpl::RegisterPrefs(registry); | 226 BrowserProcessImpl::RegisterPrefs(registry); |
| 227 chrome_prefs::RegisterPrefs(registry); |
| 227 chrome_variations::VariationsService::RegisterPrefs(registry); | 228 chrome_variations::VariationsService::RegisterPrefs(registry); |
| 228 component_updater::RegisterPrefsForRecoveryComponent(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 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); | 241 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); |
| 242 ProfileInfoCache::RegisterPrefs(registry); | 242 ProfileInfoCache::RegisterPrefs(registry); |
| 243 profiles::RegisterPrefs(registry); | 243 profiles::RegisterPrefs(registry); |
| 244 PromoResourceService::RegisterPrefs(registry); | 244 PromoResourceService::RegisterPrefs(registry); |
| 245 RegisterScreenshotPrefs(registry); | 245 RegisterScreenshotPrefs(registry); |
| 246 SigninManagerFactory::RegisterPrefs(registry); | 246 SigninManagerFactory::RegisterPrefs(registry); |
| 247 SSLConfigServiceManager::RegisterPrefs(registry); | 247 SSLConfigServiceManager::RegisterPrefs(registry); |
| 248 UpgradeDetector::RegisterPrefs(registry); | 248 UpgradeDetector::RegisterPrefs(registry); |
| 249 WebCacheManager::RegisterPrefs(registry); | 249 WebCacheManager::RegisterPrefs(registry); |
| 250 | 250 |
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 569 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 569 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 570 current_version); | 570 current_version); |
| 571 } | 571 } |
| 572 | 572 |
| 573 #if defined(OS_CHROMEOS) | 573 #if defined(OS_CHROMEOS) |
| 574 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 574 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
| 575 #endif | 575 #endif |
| 576 } | 576 } |
| 577 | 577 |
| 578 } // namespace chrome | 578 } // namespace chrome |
| OLD | NEW |