| 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/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/metrics/histogram_macros.h" | 10 #include "base/metrics/histogram_macros.h" |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 #include "components/flags_ui/pref_service_flags_storage.h" | 76 #include "components/flags_ui/pref_service_flags_storage.h" |
| 77 #include "components/gcm_driver/gcm_channel_status_syncer.h" | 77 #include "components/gcm_driver/gcm_channel_status_syncer.h" |
| 78 #include "components/metrics/metrics_service.h" | 78 #include "components/metrics/metrics_service.h" |
| 79 #include "components/network_time/network_time_tracker.h" | 79 #include "components/network_time/network_time_tracker.h" |
| 80 #include "components/ntp_snippets/bookmarks/bookmark_suggestions_provider.h" | 80 #include "components/ntp_snippets/bookmarks/bookmark_suggestions_provider.h" |
| 81 #include "components/ntp_snippets/content_suggestions_service.h" | 81 #include "components/ntp_snippets/content_suggestions_service.h" |
| 82 #include "components/ntp_snippets/remote/remote_suggestions_provider.h" | 82 #include "components/ntp_snippets/remote/remote_suggestions_provider.h" |
| 83 #include "components/ntp_snippets/remote/request_throttler.h" | 83 #include "components/ntp_snippets/remote/request_throttler.h" |
| 84 #include "components/ntp_snippets/sessions/foreign_sessions_suggestions_provider
.h" | 84 #include "components/ntp_snippets/sessions/foreign_sessions_suggestions_provider
.h" |
| 85 #include "components/ntp_snippets/user_classifier.h" | 85 #include "components/ntp_snippets/user_classifier.h" |
| 86 #include "components/ntp_tiles/most_visited_sites.h" |
| 86 #include "components/omnibox/browser/zero_suggest_provider.h" | 87 #include "components/omnibox/browser/zero_suggest_provider.h" |
| 87 #include "components/password_manager/core/browser/password_bubble_experiment.h" | 88 #include "components/password_manager/core/browser/password_bubble_experiment.h" |
| 88 #include "components/password_manager/core/browser/password_manager.h" | 89 #include "components/password_manager/core/browser/password_manager.h" |
| 89 #include "components/policy/core/browser/browser_policy_connector.h" | 90 #include "components/policy/core/browser/browser_policy_connector.h" |
| 90 #include "components/policy/core/browser/url_blacklist_manager.h" | 91 #include "components/policy/core/browser/url_blacklist_manager.h" |
| 91 #include "components/policy/core/common/policy_statistics_collector.h" | 92 #include "components/policy/core/common/policy_statistics_collector.h" |
| 92 #include "components/pref_registry/pref_registry_syncable.h" | 93 #include "components/pref_registry/pref_registry_syncable.h" |
| 93 #include "components/prefs/pref_registry_simple.h" | 94 #include "components/prefs/pref_registry_simple.h" |
| 94 #include "components/prefs/pref_service.h" | 95 #include "components/prefs/pref_service.h" |
| 95 #include "components/proxy_config/pref_proxy_config_tracker_impl.h" | 96 #include "components/proxy_config/pref_proxy_config_tracker_impl.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" | 149 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" |
| 149 #endif | 150 #endif |
| 150 | 151 |
| 151 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) | 152 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) |
| 152 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" | 153 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" |
| 153 #endif | 154 #endif |
| 154 | 155 |
| 155 #if BUILDFLAG(ANDROID_JAVA_UI) | 156 #if BUILDFLAG(ANDROID_JAVA_UI) |
| 156 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" | 157 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" |
| 157 #include "chrome/browser/android/ntp/new_tab_page_prefs.h" | 158 #include "chrome/browser/android/ntp/new_tab_page_prefs.h" |
| 158 #include "components/ntp_tiles/most_visited_sites.h" | |
| 159 #include "components/ntp_tiles/popular_sites.h" | 159 #include "components/ntp_tiles/popular_sites.h" |
| 160 #else | 160 #else |
| 161 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 161 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| 162 #include "chrome/browser/upgrade_detector.h" | 162 #include "chrome/browser/upgrade_detector.h" |
| 163 #endif | 163 #endif |
| 164 | 164 |
| 165 #if defined(OS_ANDROID) | 165 #if defined(OS_ANDROID) |
| 166 #include "chrome/browser/android/preferences/browser_prefs_android.h" | 166 #include "chrome/browser/android/preferences/browser_prefs_android.h" |
| 167 #else | 167 #else |
| 168 #include "chrome/browser/services/gcm/gcm_product_util.h" | 168 #include "chrome/browser/services/gcm/gcm_product_util.h" |
| (...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 491 MediaDeviceIDSalt::RegisterProfilePrefs(registry); | 491 MediaDeviceIDSalt::RegisterProfilePrefs(registry); |
| 492 MediaStreamDevicesController::RegisterProfilePrefs(registry); | 492 MediaStreamDevicesController::RegisterProfilePrefs(registry); |
| 493 NotifierStateTracker::RegisterProfilePrefs(registry); | 493 NotifierStateTracker::RegisterProfilePrefs(registry); |
| 494 ntp_snippets::BookmarkSuggestionsProvider::RegisterProfilePrefs(registry); | 494 ntp_snippets::BookmarkSuggestionsProvider::RegisterProfilePrefs(registry); |
| 495 ntp_snippets::ForeignSessionsSuggestionsProvider::RegisterProfilePrefs( | 495 ntp_snippets::ForeignSessionsSuggestionsProvider::RegisterProfilePrefs( |
| 496 registry); | 496 registry); |
| 497 ntp_snippets::RemoteSuggestionsProvider::RegisterProfilePrefs(registry); | 497 ntp_snippets::RemoteSuggestionsProvider::RegisterProfilePrefs(registry); |
| 498 ntp_snippets::ContentSuggestionsService::RegisterProfilePrefs(registry); | 498 ntp_snippets::ContentSuggestionsService::RegisterProfilePrefs(registry); |
| 499 ntp_snippets::RequestThrottler::RegisterProfilePrefs(registry); | 499 ntp_snippets::RequestThrottler::RegisterProfilePrefs(registry); |
| 500 ntp_snippets::UserClassifier::RegisterProfilePrefs(registry); | 500 ntp_snippets::UserClassifier::RegisterProfilePrefs(registry); |
| 501 ntp_tiles::MostVisitedSites::RegisterProfilePrefs(registry); |
| 501 password_bubble_experiment::RegisterPrefs(registry); | 502 password_bubble_experiment::RegisterPrefs(registry); |
| 502 password_manager::PasswordManager::RegisterProfilePrefs(registry); | 503 password_manager::PasswordManager::RegisterProfilePrefs(registry); |
| 503 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); | 504 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); |
| 504 PrefsTabHelper::RegisterProfilePrefs(registry); | 505 PrefsTabHelper::RegisterProfilePrefs(registry); |
| 505 Profile::RegisterProfilePrefs(registry); | 506 Profile::RegisterProfilePrefs(registry); |
| 506 ProfileImpl::RegisterProfilePrefs(registry); | 507 ProfileImpl::RegisterProfilePrefs(registry); |
| 507 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); | 508 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); |
| 508 PushMessagingAppIdentifier::RegisterProfilePrefs(registry); | 509 PushMessagingAppIdentifier::RegisterProfilePrefs(registry); |
| 509 RegisterBrowserUserPrefs(registry); | 510 RegisterBrowserUserPrefs(registry); |
| 510 SessionStartupPref::RegisterProfilePrefs(registry); | 511 SessionStartupPref::RegisterProfilePrefs(registry); |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 553 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry); | 554 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry); |
| 554 SupervisedUserSyncService::RegisterProfilePrefs(registry); | 555 SupervisedUserSyncService::RegisterProfilePrefs(registry); |
| 555 #endif | 556 #endif |
| 556 ChildAccountService::RegisterProfilePrefs(registry); | 557 ChildAccountService::RegisterProfilePrefs(registry); |
| 557 SupervisedUserService::RegisterProfilePrefs(registry); | 558 SupervisedUserService::RegisterProfilePrefs(registry); |
| 558 SupervisedUserWhitelistService::RegisterProfilePrefs(registry); | 559 SupervisedUserWhitelistService::RegisterProfilePrefs(registry); |
| 559 #endif | 560 #endif |
| 560 | 561 |
| 561 #if BUILDFLAG(ANDROID_JAVA_UI) | 562 #if BUILDFLAG(ANDROID_JAVA_UI) |
| 562 variations::VariationsService::RegisterProfilePrefs(registry); | 563 variations::VariationsService::RegisterProfilePrefs(registry); |
| 563 ntp_tiles::MostVisitedSites::RegisterProfilePrefs(registry); | |
| 564 ntp_tiles::PopularSites::RegisterProfilePrefs(registry); | 564 ntp_tiles::PopularSites::RegisterProfilePrefs(registry); |
| 565 NewTabPagePrefs::RegisterProfilePrefs(registry); | 565 NewTabPagePrefs::RegisterProfilePrefs(registry); |
| 566 PartnerBookmarksShim::RegisterProfilePrefs(registry); | 566 PartnerBookmarksShim::RegisterProfilePrefs(registry); |
| 567 #else | 567 #else |
| 568 AppShortcutManager::RegisterProfilePrefs(registry); | 568 AppShortcutManager::RegisterProfilePrefs(registry); |
| 569 DeviceIDFetcher::RegisterProfilePrefs(registry); | 569 DeviceIDFetcher::RegisterProfilePrefs(registry); |
| 570 DevToolsWindow::RegisterProfilePrefs(registry); | 570 DevToolsWindow::RegisterProfilePrefs(registry); |
| 571 #if BUILDFLAG(ENABLE_APP_LIST) | 571 #if BUILDFLAG(ENABLE_APP_LIST) |
| 572 DriveAppMapping::RegisterProfilePrefs(registry); | 572 DriveAppMapping::RegisterProfilePrefs(registry); |
| 573 app_list::AppListSyncableService::RegisterProfilePrefs(registry); | 573 app_list::AppListSyncableService::RegisterProfilePrefs(registry); |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 780 // Added 8/2016. | 780 // Added 8/2016. |
| 781 profile_prefs->ClearPref(kStaticEncodings); | 781 profile_prefs->ClearPref(kStaticEncodings); |
| 782 profile_prefs->ClearPref(kRecentlySelectedEncoding); | 782 profile_prefs->ClearPref(kRecentlySelectedEncoding); |
| 783 | 783 |
| 784 // Added 9/2016. | 784 // Added 9/2016. |
| 785 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); | 785 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); |
| 786 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); | 786 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); |
| 787 } | 787 } |
| 788 | 788 |
| 789 } // namespace chrome | 789 } // namespace chrome |
| OLD | NEW |