| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 #include "chrome/browser/plugins/plugin_finder.h" | 51 #include "chrome/browser/plugins/plugin_finder.h" |
| 52 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 52 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| 53 #include "chrome/browser/prefs/pref_service_syncable.h" | 53 #include "chrome/browser/prefs/pref_service_syncable.h" |
| 54 #include "chrome/browser/prefs/session_startup_pref.h" | 54 #include "chrome/browser/prefs/session_startup_pref.h" |
| 55 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" | 55 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" |
| 56 #include "chrome/browser/printing/print_dialog_cloud.h" | 56 #include "chrome/browser/printing/print_dialog_cloud.h" |
| 57 #include "chrome/browser/profiles/chrome_version_service.h" | 57 #include "chrome/browser/profiles/chrome_version_service.h" |
| 58 #include "chrome/browser/profiles/profile.h" | 58 #include "chrome/browser/profiles/profile.h" |
| 59 #include "chrome/browser/profiles/profile_impl.h" | 59 #include "chrome/browser/profiles/profile_impl.h" |
| 60 #include "chrome/browser/profiles/profile_info_cache.h" | 60 #include "chrome/browser/profiles/profile_info_cache.h" |
| 61 #include "chrome/browser/profiles/profile_manager.h" | 61 #include "chrome/browser/profiles/profile_manager_util.h" |
| 62 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" | 62 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" |
| 63 #include "chrome/browser/renderer_host/web_cache_manager.h" | 63 #include "chrome/browser/renderer_host/web_cache_manager.h" |
| 64 #include "chrome/browser/search/search.h" | 64 #include "chrome/browser/search/search.h" |
| 65 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 65 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| 66 #include "chrome/browser/signin/signin_manager_factory.h" | 66 #include "chrome/browser/signin/signin_manager_factory.h" |
| 67 #include "chrome/browser/sync/sync_prefs.h" | 67 #include "chrome/browser/sync/sync_prefs.h" |
| 68 #include "chrome/browser/task_manager/task_manager.h" | 68 #include "chrome/browser/task_manager/task_manager.h" |
| 69 #include "chrome/browser/translate/translate_prefs.h" | 69 #include "chrome/browser/translate/translate_prefs.h" |
| 70 #include "chrome/browser/ui/alternate_error_tab_observer.h" | 70 #include "chrome/browser/ui/alternate_error_tab_observer.h" |
| 71 #include "chrome/browser/ui/app_list/app_list_service.h" | 71 #include "chrome/browser/ui/app_list/app_list_service.h" |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 GLStringManager::RegisterPrefs(registry); | 198 GLStringManager::RegisterPrefs(registry); |
| 199 GpuModeManager::RegisterPrefs(registry); | 199 GpuModeManager::RegisterPrefs(registry); |
| 200 IntranetRedirectDetector::RegisterPrefs(registry); | 200 IntranetRedirectDetector::RegisterPrefs(registry); |
| 201 IOThread::RegisterPrefs(registry); | 201 IOThread::RegisterPrefs(registry); |
| 202 KeywordEditorController::RegisterPrefs(registry); | 202 KeywordEditorController::RegisterPrefs(registry); |
| 203 MetricsLog::RegisterPrefs(registry); | 203 MetricsLog::RegisterPrefs(registry); |
| 204 MetricsService::RegisterPrefs(registry); | 204 MetricsService::RegisterPrefs(registry); |
| 205 metrics::CachingPermutedEntropyProvider::RegisterPrefs(registry); | 205 metrics::CachingPermutedEntropyProvider::RegisterPrefs(registry); |
| 206 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); | 206 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); |
| 207 ProfileInfoCache::RegisterPrefs(registry); | 207 ProfileInfoCache::RegisterPrefs(registry); |
| 208 ProfileManager::RegisterPrefs(registry); | 208 profiles::RegisterPrefs(registry); |
| 209 PromoResourceService::RegisterPrefs(registry); | 209 PromoResourceService::RegisterPrefs(registry); |
| 210 RegisterPrefsForRecoveryComponent(registry); | 210 RegisterPrefsForRecoveryComponent(registry); |
| 211 SigninManagerFactory::RegisterPrefs(registry); | 211 SigninManagerFactory::RegisterPrefs(registry); |
| 212 SSLConfigServiceManager::RegisterPrefs(registry); | 212 SSLConfigServiceManager::RegisterPrefs(registry); |
| 213 UpgradeDetector::RegisterPrefs(registry); | 213 UpgradeDetector::RegisterPrefs(registry); |
| 214 WebCacheManager::RegisterPrefs(registry); | 214 WebCacheManager::RegisterPrefs(registry); |
| 215 chrome_variations::VariationsService::RegisterPrefs(registry); | 215 chrome_variations::VariationsService::RegisterPrefs(registry); |
| 216 | 216 |
| 217 #if defined(ENABLE_MANAGED_USERS) | 217 #if defined(ENABLE_MANAGED_USERS) |
| 218 ManagedMode::RegisterPrefs(registry); | 218 ManagedMode::RegisterPrefs(registry); |
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 475 } | 475 } |
| 476 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 476 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 477 | 477 |
| 478 current_version |= GOOGLE_URL_TRACKER_PREFS; | 478 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 479 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 479 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 480 current_version); | 480 current_version); |
| 481 } | 481 } |
| 482 } | 482 } |
| 483 | 483 |
| 484 } // namespace chrome | 484 } // namespace chrome |
| OLD | NEW |