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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 #include "chrome/browser/ui/webui/flags_ui.h" | 87 #include "chrome/browser/ui/webui/flags_ui.h" |
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/upgrade_detector.h" | 92 #include "chrome/browser/upgrade_detector.h" |
93 #include "chrome/browser/web_resource/promo_resource_service.h" | 93 #include "chrome/browser/web_resource/promo_resource_service.h" |
94 #include "chrome/common/metrics/caching_permuted_entropy_provider.h" | 94 #include "chrome/common/metrics/caching_permuted_entropy_provider.h" |
95 #include "chrome/common/pref_names.h" | 95 #include "chrome/common/pref_names.h" |
96 #include "components/autofill/core/browser/autofill_manager.h" | 96 #include "components/autofill/core/browser/autofill_manager.h" |
| 97 #include "components/rappor/rappor_service.h" |
97 #include "components/user_prefs/pref_registry_syncable.h" | 98 #include "components/user_prefs/pref_registry_syncable.h" |
98 #include "content/public/browser/render_process_host.h" | 99 #include "content/public/browser/render_process_host.h" |
99 #include "extensions/browser/extension_prefs.h" | 100 #include "extensions/browser/extension_prefs.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 "components/policy/core/browser/browser_policy_connector.h" | 107 #include "components/policy/core/browser/browser_policy_connector.h" |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
236 IntranetRedirectDetector::RegisterPrefs(registry); | 237 IntranetRedirectDetector::RegisterPrefs(registry); |
237 IOThread::RegisterPrefs(registry); | 238 IOThread::RegisterPrefs(registry); |
238 KeywordEditorController::RegisterPrefs(registry); | 239 KeywordEditorController::RegisterPrefs(registry); |
239 MetricsLog::RegisterPrefs(registry); | 240 MetricsLog::RegisterPrefs(registry); |
240 MetricsService::RegisterPrefs(registry); | 241 MetricsService::RegisterPrefs(registry); |
241 metrics::CachingPermutedEntropyProvider::RegisterPrefs(registry); | 242 metrics::CachingPermutedEntropyProvider::RegisterPrefs(registry); |
242 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); | 243 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); |
243 ProfileInfoCache::RegisterPrefs(registry); | 244 ProfileInfoCache::RegisterPrefs(registry); |
244 profiles::RegisterPrefs(registry); | 245 profiles::RegisterPrefs(registry); |
245 PromoResourceService::RegisterPrefs(registry); | 246 PromoResourceService::RegisterPrefs(registry); |
| 247 rappor::RapporService::RegisterPrefs(registry); |
246 RegisterScreenshotPrefs(registry); | 248 RegisterScreenshotPrefs(registry); |
247 SigninManagerFactory::RegisterPrefs(registry); | 249 SigninManagerFactory::RegisterPrefs(registry); |
248 SSLConfigServiceManager::RegisterPrefs(registry); | 250 SSLConfigServiceManager::RegisterPrefs(registry); |
249 UpgradeDetector::RegisterPrefs(registry); | 251 UpgradeDetector::RegisterPrefs(registry); |
250 WebCacheManager::RegisterPrefs(registry); | 252 WebCacheManager::RegisterPrefs(registry); |
251 | 253 |
252 #if defined(ENABLE_AUTOFILL_DIALOG) | 254 #if defined(ENABLE_AUTOFILL_DIALOG) |
253 autofill::AutofillDialogController::RegisterPrefs(registry); | 255 autofill::AutofillDialogController::RegisterPrefs(registry); |
254 #endif | 256 #endif |
255 | 257 |
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
571 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 573 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
572 current_version); | 574 current_version); |
573 } | 575 } |
574 | 576 |
575 #if defined(OS_CHROMEOS) | 577 #if defined(OS_CHROMEOS) |
576 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 578 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
577 #endif | 579 #endif |
578 } | 580 } |
579 | 581 |
580 } // namespace chrome | 582 } // namespace chrome |
OLD | NEW |