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/predictor.h" | 45 #include "chrome/browser/net/predictor.h" |
46 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" | 46 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" |
47 #include "chrome/browser/net/ssl_config_service_manager.h" | 47 #include "chrome/browser/net/ssl_config_service_manager.h" |
48 #include "chrome/browser/notifications/desktop_notification_service.h" | 48 #include "chrome/browser/notifications/desktop_notification_service.h" |
49 #include "chrome/browser/notifications/notification_prefs_manager.h" | 49 #include "chrome/browser/notifications/notification_prefs_manager.h" |
50 #include "chrome/browser/password_manager/password_generation_manager.h" | 50 #include "chrome/browser/password_manager/password_generation_manager.h" |
51 #include "chrome/browser/password_manager/password_manager.h" | 51 #include "chrome/browser/password_manager/password_manager.h" |
52 #include "chrome/browser/pepper_flash_settings_manager.h" | 52 #include "chrome/browser/pepper_flash_settings_manager.h" |
53 #include "chrome/browser/plugins/plugin_finder.h" | 53 #include "chrome/browser/plugins/plugin_finder.h" |
54 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 54 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| 55 #include "chrome/browser/prefs/pref_metrics_service.h" |
55 #include "chrome/browser/prefs/pref_service_syncable.h" | 56 #include "chrome/browser/prefs/pref_service_syncable.h" |
56 #include "chrome/browser/prefs/session_startup_pref.h" | 57 #include "chrome/browser/prefs/session_startup_pref.h" |
57 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" | 58 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" |
58 #include "chrome/browser/printing/print_dialog_cloud.h" | 59 #include "chrome/browser/printing/print_dialog_cloud.h" |
59 #include "chrome/browser/profiles/chrome_version_service.h" | 60 #include "chrome/browser/profiles/chrome_version_service.h" |
60 #include "chrome/browser/profiles/profile.h" | 61 #include "chrome/browser/profiles/profile.h" |
61 #include "chrome/browser/profiles/profile_impl.h" | 62 #include "chrome/browser/profiles/profile_impl.h" |
62 #include "chrome/browser/profiles/profile_info_cache.h" | 63 #include "chrome/browser/profiles/profile_info_cache.h" |
63 #include "chrome/browser/profiles/profiles_state.h" | 64 #include "chrome/browser/profiles/profiles_state.h" |
64 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" | 65 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
209 FlagsUI::RegisterPrefs(registry); | 210 FlagsUI::RegisterPrefs(registry); |
210 geolocation::RegisterPrefs(registry); | 211 geolocation::RegisterPrefs(registry); |
211 GLStringManager::RegisterPrefs(registry); | 212 GLStringManager::RegisterPrefs(registry); |
212 GpuModeManager::RegisterPrefs(registry); | 213 GpuModeManager::RegisterPrefs(registry); |
213 IntranetRedirectDetector::RegisterPrefs(registry); | 214 IntranetRedirectDetector::RegisterPrefs(registry); |
214 IOThread::RegisterPrefs(registry); | 215 IOThread::RegisterPrefs(registry); |
215 KeywordEditorController::RegisterPrefs(registry); | 216 KeywordEditorController::RegisterPrefs(registry); |
216 MetricsLog::RegisterPrefs(registry); | 217 MetricsLog::RegisterPrefs(registry); |
217 MetricsService::RegisterPrefs(registry); | 218 MetricsService::RegisterPrefs(registry); |
218 metrics::CachingPermutedEntropyProvider::RegisterPrefs(registry); | 219 metrics::CachingPermutedEntropyProvider::RegisterPrefs(registry); |
| 220 PrefMetricsService::RegisterPrefs(registry); |
219 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); | 221 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); |
220 ProfileInfoCache::RegisterPrefs(registry); | 222 ProfileInfoCache::RegisterPrefs(registry); |
221 profiles::RegisterPrefs(registry); | 223 profiles::RegisterPrefs(registry); |
222 PromoResourceService::RegisterPrefs(registry); | 224 PromoResourceService::RegisterPrefs(registry); |
223 RegisterPrefsForRecoveryComponent(registry); | 225 RegisterPrefsForRecoveryComponent(registry); |
224 SigninManagerFactory::RegisterPrefs(registry); | 226 SigninManagerFactory::RegisterPrefs(registry); |
225 SSLConfigServiceManager::RegisterPrefs(registry); | 227 SSLConfigServiceManager::RegisterPrefs(registry); |
226 UpgradeDetector::RegisterPrefs(registry); | 228 UpgradeDetector::RegisterPrefs(registry); |
227 WebCacheManager::RegisterPrefs(registry); | 229 WebCacheManager::RegisterPrefs(registry); |
228 chrome_variations::VariationsService::RegisterPrefs(registry); | 230 chrome_variations::VariationsService::RegisterPrefs(registry); |
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
525 } | 527 } |
526 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 528 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
527 | 529 |
528 current_version |= GOOGLE_URL_TRACKER_PREFS; | 530 current_version |= GOOGLE_URL_TRACKER_PREFS; |
529 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 531 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
530 current_version); | 532 current_version); |
531 } | 533 } |
532 } | 534 } |
533 | 535 |
534 } // namespace chrome | 536 } // namespace chrome |
OLD | NEW |