| 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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 #include "chrome/browser/ui/webui/instant_ui.h" | 88 #include "chrome/browser/ui/webui/instant_ui.h" |
| 89 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 89 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
| 90 #include "chrome/browser/ui/webui/plugins_ui.h" | 90 #include "chrome/browser/ui/webui/plugins_ui.h" |
| 91 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" | 91 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" |
| 92 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" | 92 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" |
| 93 #include "chrome/browser/upgrade_detector.h" | 93 #include "chrome/browser/upgrade_detector.h" |
| 94 #include "chrome/browser/web_resource/promo_resource_service.h" | 94 #include "chrome/browser/web_resource/promo_resource_service.h" |
| 95 #include "chrome/common/metrics/caching_permuted_entropy_provider.h" | 95 #include "chrome/common/metrics/caching_permuted_entropy_provider.h" |
| 96 #include "chrome/common/pref_names.h" | 96 #include "chrome/common/pref_names.h" |
| 97 #include "components/autofill/core/browser/autofill_manager.h" | 97 #include "components/autofill/core/browser/autofill_manager.h" |
| 98 #include "components/rappor/rappor_service.h" |
| 98 #include "components/user_prefs/pref_registry_syncable.h" | 99 #include "components/user_prefs/pref_registry_syncable.h" |
| 99 #include "content/public/browser/render_process_host.h" | 100 #include "content/public/browser/render_process_host.h" |
| 100 | 101 |
| 101 #if defined(ENABLE_AUTOFILL_DIALOG) | 102 #if defined(ENABLE_AUTOFILL_DIALOG) |
| 102 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h" | 103 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h" |
| 103 #endif | 104 #endif |
| 104 | 105 |
| 105 #if defined(ENABLE_CONFIGURATION_POLICY) | 106 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 106 #include "chrome/browser/policy/browser_policy_connector.h" | 107 #include "chrome/browser/policy/browser_policy_connector.h" |
| 107 #include "chrome/browser/policy/policy_statistics_collector.h" | 108 #include "chrome/browser/policy/policy_statistics_collector.h" |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 IOThread::RegisterPrefs(registry); | 230 IOThread::RegisterPrefs(registry); |
| 230 KeywordEditorController::RegisterPrefs(registry); | 231 KeywordEditorController::RegisterPrefs(registry); |
| 231 MetricsLog::RegisterPrefs(registry); | 232 MetricsLog::RegisterPrefs(registry); |
| 232 MetricsService::RegisterPrefs(registry); | 233 MetricsService::RegisterPrefs(registry); |
| 233 metrics::CachingPermutedEntropyProvider::RegisterPrefs(registry); | 234 metrics::CachingPermutedEntropyProvider::RegisterPrefs(registry); |
| 234 PrefMetricsService::RegisterPrefs(registry); | 235 PrefMetricsService::RegisterPrefs(registry); |
| 235 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); | 236 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); |
| 236 ProfileInfoCache::RegisterPrefs(registry); | 237 ProfileInfoCache::RegisterPrefs(registry); |
| 237 profiles::RegisterPrefs(registry); | 238 profiles::RegisterPrefs(registry); |
| 238 PromoResourceService::RegisterPrefs(registry); | 239 PromoResourceService::RegisterPrefs(registry); |
| 240 rappor::RapporService::RegisterPrefs(registry); |
| 239 RegisterPrefsForRecoveryComponent(registry); | 241 RegisterPrefsForRecoveryComponent(registry); |
| 240 RegisterScreenshotPrefs(registry); | 242 RegisterScreenshotPrefs(registry); |
| 241 SigninManagerFactory::RegisterPrefs(registry); | 243 SigninManagerFactory::RegisterPrefs(registry); |
| 242 SSLConfigServiceManager::RegisterPrefs(registry); | 244 SSLConfigServiceManager::RegisterPrefs(registry); |
| 243 UpgradeDetector::RegisterPrefs(registry); | 245 UpgradeDetector::RegisterPrefs(registry); |
| 244 WebCacheManager::RegisterPrefs(registry); | 246 WebCacheManager::RegisterPrefs(registry); |
| 245 | 247 |
| 246 #if defined(ENABLE_AUTOFILL_DIALOG) | 248 #if defined(ENABLE_AUTOFILL_DIALOG) |
| 247 autofill::AutofillDialogController::RegisterPrefs(registry); | 249 autofill::AutofillDialogController::RegisterPrefs(registry); |
| 248 #endif | 250 #endif |
| (...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 559 } | 561 } |
| 560 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 562 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 561 | 563 |
| 562 current_version |= GOOGLE_URL_TRACKER_PREFS; | 564 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 563 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 565 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 564 current_version); | 566 current_version); |
| 565 } | 567 } |
| 566 } | 568 } |
| 567 | 569 |
| 568 } // namespace chrome | 570 } // namespace chrome |
| OLD | NEW |