| 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/profiles_state.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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 GLStringManager::RegisterPrefs(registry); | 200 GLStringManager::RegisterPrefs(registry); |
| 201 GpuModeManager::RegisterPrefs(registry); | 201 GpuModeManager::RegisterPrefs(registry); |
| 202 IntranetRedirectDetector::RegisterPrefs(registry); | 202 IntranetRedirectDetector::RegisterPrefs(registry); |
| 203 IOThread::RegisterPrefs(registry); | 203 IOThread::RegisterPrefs(registry); |
| 204 KeywordEditorController::RegisterPrefs(registry); | 204 KeywordEditorController::RegisterPrefs(registry); |
| 205 MetricsLog::RegisterPrefs(registry); | 205 MetricsLog::RegisterPrefs(registry); |
| 206 MetricsService::RegisterPrefs(registry); | 206 MetricsService::RegisterPrefs(registry); |
| 207 metrics::CachingPermutedEntropyProvider::RegisterPrefs(registry); | 207 metrics::CachingPermutedEntropyProvider::RegisterPrefs(registry); |
| 208 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); | 208 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); |
| 209 ProfileInfoCache::RegisterPrefs(registry); | 209 ProfileInfoCache::RegisterPrefs(registry); |
| 210 ProfileManager::RegisterPrefs(registry); | 210 profiles::RegisterPrefs(registry); |
| 211 PromoResourceService::RegisterPrefs(registry); | 211 PromoResourceService::RegisterPrefs(registry); |
| 212 RegisterPrefsForRecoveryComponent(registry); | 212 RegisterPrefsForRecoveryComponent(registry); |
| 213 SigninManagerFactory::RegisterPrefs(registry); | 213 SigninManagerFactory::RegisterPrefs(registry); |
| 214 SSLConfigServiceManager::RegisterPrefs(registry); | 214 SSLConfigServiceManager::RegisterPrefs(registry); |
| 215 UpgradeDetector::RegisterPrefs(registry); | 215 UpgradeDetector::RegisterPrefs(registry); |
| 216 WebCacheManager::RegisterPrefs(registry); | 216 WebCacheManager::RegisterPrefs(registry); |
| 217 chrome_variations::VariationsService::RegisterPrefs(registry); | 217 chrome_variations::VariationsService::RegisterPrefs(registry); |
| 218 | 218 |
| 219 #if defined(ENABLE_MANAGED_USERS) | 219 #if defined(ENABLE_MANAGED_USERS) |
| 220 ManagedMode::RegisterPrefs(registry); | 220 ManagedMode::RegisterPrefs(registry); |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 480 } | 480 } |
| 481 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 481 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 482 | 482 |
| 483 current_version |= GOOGLE_URL_TRACKER_PREFS; | 483 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 484 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 484 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 485 current_version); | 485 current_version); |
| 486 } | 486 } |
| 487 } | 487 } |
| 488 | 488 |
| 489 } // namespace chrome | 489 } // namespace chrome |
| OLD | NEW |