| 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 <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/metrics/histogram_macros.h" | 9 #include "base/metrics/histogram_macros.h" |
| 10 #include "base/prefs/pref_registry_simple.h" | 10 #include "base/prefs/pref_registry_simple.h" |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 #include "components/gcm_driver/gcm_channel_status_syncer.h" | 77 #include "components/gcm_driver/gcm_channel_status_syncer.h" |
| 78 #include "components/network_time/network_time_tracker.h" | 78 #include "components/network_time/network_time_tracker.h" |
| 79 #include "components/omnibox/browser/zero_suggest_provider.h" | 79 #include "components/omnibox/browser/zero_suggest_provider.h" |
| 80 #include "components/password_manager/core/browser/password_bubble_experiment.h" | 80 #include "components/password_manager/core/browser/password_bubble_experiment.h" |
| 81 #include "components/password_manager/core/browser/password_manager.h" | 81 #include "components/password_manager/core/browser/password_manager.h" |
| 82 #include "components/pref_registry/pref_registry_syncable.h" | 82 #include "components/pref_registry/pref_registry_syncable.h" |
| 83 #include "components/proxy_config/pref_proxy_config_tracker_impl.h" | 83 #include "components/proxy_config/pref_proxy_config_tracker_impl.h" |
| 84 #include "components/rappor/rappor_service.h" | 84 #include "components/rappor/rappor_service.h" |
| 85 #include "components/search_engines/template_url_prepopulate_data.h" | 85 #include "components/search_engines/template_url_prepopulate_data.h" |
| 86 #include "components/ssl_config/ssl_config_service_manager.h" | 86 #include "components/ssl_config/ssl_config_service_manager.h" |
| 87 #include "components/startup_metric_utils/browser/startup_metric_utils.h" |
| 87 #include "components/sync_driver/sync_prefs.h" | 88 #include "components/sync_driver/sync_prefs.h" |
| 88 #include "components/syncable_prefs/pref_service_syncable.h" | 89 #include "components/syncable_prefs/pref_service_syncable.h" |
| 89 #include "components/translate/core/browser/translate_prefs.h" | 90 #include "components/translate/core/browser/translate_prefs.h" |
| 90 #include "components/variations/service/variations_service.h" | 91 #include "components/variations/service/variations_service.h" |
| 91 #include "components/web_resource/promo_resource_service.h" | 92 #include "components/web_resource/promo_resource_service.h" |
| 92 #include "content/public/browser/render_process_host.h" | 93 #include "content/public/browser/render_process_host.h" |
| 93 #include "net/http/http_server_properties_manager.h" | 94 #include "net/http/http_server_properties_manager.h" |
| 94 | 95 |
| 95 #if defined(ENABLE_AUTOFILL_DIALOG) | 96 #if defined(ENABLE_AUTOFILL_DIALOG) |
| 96 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h" | 97 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h" |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 IntranetRedirectDetector::RegisterPrefs(registry); | 269 IntranetRedirectDetector::RegisterPrefs(registry); |
| 269 IOThread::RegisterPrefs(registry); | 270 IOThread::RegisterPrefs(registry); |
| 270 network_time::NetworkTimeTracker::RegisterPrefs(registry); | 271 network_time::NetworkTimeTracker::RegisterPrefs(registry); |
| 271 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); | 272 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); |
| 272 ProfileInfoCache::RegisterPrefs(registry); | 273 ProfileInfoCache::RegisterPrefs(registry); |
| 273 profiles::RegisterPrefs(registry); | 274 profiles::RegisterPrefs(registry); |
| 274 rappor::RapporService::RegisterPrefs(registry); | 275 rappor::RapporService::RegisterPrefs(registry); |
| 275 RegisterScreenshotPrefs(registry); | 276 RegisterScreenshotPrefs(registry); |
| 276 SigninManagerFactory::RegisterPrefs(registry); | 277 SigninManagerFactory::RegisterPrefs(registry); |
| 277 ssl_config::SSLConfigServiceManager::RegisterPrefs(registry); | 278 ssl_config::SSLConfigServiceManager::RegisterPrefs(registry); |
| 279 startup_metric_utils::RegisterPrefs(registry); |
| 278 web_resource::PromoResourceService::RegisterPrefs(registry); | 280 web_resource::PromoResourceService::RegisterPrefs(registry); |
| 279 | 281 |
| 280 #if defined(ENABLE_AUTOFILL_DIALOG) | 282 #if defined(ENABLE_AUTOFILL_DIALOG) |
| 281 autofill::AutofillDialogController::RegisterPrefs(registry); | 283 autofill::AutofillDialogController::RegisterPrefs(registry); |
| 282 #endif | 284 #endif |
| 283 | 285 |
| 284 #if defined(ENABLE_CONFIGURATION_POLICY) | 286 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 285 policy::BrowserPolicyConnector::RegisterPrefs(registry); | 287 policy::BrowserPolicyConnector::RegisterPrefs(registry); |
| 286 policy::PolicyStatisticsCollector::RegisterPrefs(registry); | 288 policy::PolicyStatisticsCollector::RegisterPrefs(registry); |
| 287 #endif | 289 #endif |
| (...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 597 | 599 |
| 598 // Added 12/1015. | 600 // Added 12/1015. |
| 599 profile_prefs->ClearPref(kURLsToRestoreOnStartupOld); | 601 profile_prefs->ClearPref(kURLsToRestoreOnStartupOld); |
| 600 profile_prefs->ClearPref(kRestoreStartupURLsMigrationTime); | 602 profile_prefs->ClearPref(kRestoreStartupURLsMigrationTime); |
| 601 | 603 |
| 602 // Added 12/2015. | 604 // Added 12/2015. |
| 603 profile_prefs->ClearPref(kRestoreOnStartupMigrated); | 605 profile_prefs->ClearPref(kRestoreOnStartupMigrated); |
| 604 } | 606 } |
| 605 | 607 |
| 606 } // namespace chrome | 608 } // namespace chrome |
| OLD | NEW |