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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 #include "chrome/browser/ui/webui/instant_ui.h" | 90 #include "chrome/browser/ui/webui/instant_ui.h" |
91 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 91 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
92 #include "chrome/browser/ui/webui/plugins_ui.h" | 92 #include "chrome/browser/ui/webui/plugins_ui.h" |
93 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" | 93 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" |
94 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" | 94 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" |
95 #include "chrome/browser/upgrade_detector.h" | 95 #include "chrome/browser/upgrade_detector.h" |
96 #include "chrome/browser/web_resource/promo_resource_service.h" | 96 #include "chrome/browser/web_resource/promo_resource_service.h" |
97 #include "chrome/common/metrics/caching_permuted_entropy_provider.h" | 97 #include "chrome/common/metrics/caching_permuted_entropy_provider.h" |
98 #include "chrome/common/pref_names.h" | 98 #include "chrome/common/pref_names.h" |
99 #include "components/autofill/core/browser/autofill_manager.h" | 99 #include "components/autofill/core/browser/autofill_manager.h" |
| 100 #include "components/rappor/rappor_service.h" |
100 #include "components/user_prefs/pref_registry_syncable.h" | 101 #include "components/user_prefs/pref_registry_syncable.h" |
101 #include "content/public/browser/render_process_host.h" | 102 #include "content/public/browser/render_process_host.h" |
102 | 103 |
103 #if defined(ENABLE_AUTOFILL_DIALOG) | 104 #if defined(ENABLE_AUTOFILL_DIALOG) |
104 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h" | 105 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h" |
105 #endif | 106 #endif |
106 | 107 |
107 #if defined(ENABLE_CONFIGURATION_POLICY) | 108 #if defined(ENABLE_CONFIGURATION_POLICY) |
108 #include "chrome/browser/policy/browser_policy_connector.h" | 109 #include "chrome/browser/policy/browser_policy_connector.h" |
109 #include "components/policy/core/browser/url_blacklist_manager.h" | 110 #include "components/policy/core/browser/url_blacklist_manager.h" |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
235 IOThread::RegisterPrefs(registry); | 236 IOThread::RegisterPrefs(registry); |
236 KeywordEditorController::RegisterPrefs(registry); | 237 KeywordEditorController::RegisterPrefs(registry); |
237 MetricsLog::RegisterPrefs(registry); | 238 MetricsLog::RegisterPrefs(registry); |
238 MetricsService::RegisterPrefs(registry); | 239 MetricsService::RegisterPrefs(registry); |
239 metrics::CachingPermutedEntropyProvider::RegisterPrefs(registry); | 240 metrics::CachingPermutedEntropyProvider::RegisterPrefs(registry); |
240 PrefHashStoreImpl::RegisterPrefs(registry); | 241 PrefHashStoreImpl::RegisterPrefs(registry); |
241 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); | 242 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); |
242 ProfileInfoCache::RegisterPrefs(registry); | 243 ProfileInfoCache::RegisterPrefs(registry); |
243 profiles::RegisterPrefs(registry); | 244 profiles::RegisterPrefs(registry); |
244 PromoResourceService::RegisterPrefs(registry); | 245 PromoResourceService::RegisterPrefs(registry); |
| 246 rappor::RapporService::RegisterPrefs(registry); |
245 RegisterPrefsForRecoveryComponent(registry); | 247 RegisterPrefsForRecoveryComponent(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 |
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
566 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 568 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
567 current_version); | 569 current_version); |
568 } | 570 } |
569 | 571 |
570 #if defined(OS_CHROMEOS) | 572 #if defined(OS_CHROMEOS) |
571 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 573 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
572 #endif | 574 #endif |
573 } | 575 } |
574 | 576 |
575 } // namespace chrome | 577 } // namespace chrome |
OLD | NEW |