| 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 #include "chrome/browser/android/ntp/new_tab_page_prefs.h" | 154 #include "chrome/browser/android/ntp/new_tab_page_prefs.h" |
| 155 #include "components/ntp_tiles/most_visited_sites.h" | 155 #include "components/ntp_tiles/most_visited_sites.h" |
| 156 #include "components/ntp_tiles/popular_sites.h" | 156 #include "components/ntp_tiles/popular_sites.h" |
| 157 #else | 157 #else |
| 158 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 158 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| 159 #include "chrome/browser/upgrade_detector.h" | 159 #include "chrome/browser/upgrade_detector.h" |
| 160 #endif | 160 #endif |
| 161 | 161 |
| 162 #if defined(OS_ANDROID) | 162 #if defined(OS_ANDROID) |
| 163 #include "chrome/browser/notifications/notification_platform_bridge_android.h" | 163 #include "chrome/browser/notifications/notification_platform_bridge_android.h" |
| 164 #include "chrome/browser/ntp_snippets/download_suggestions_provider.h" |
| 164 #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider.
h" | 165 #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider.
h" |
| 165 #else | 166 #else |
| 166 #include "chrome/browser/services/gcm/gcm_product_util.h" | 167 #include "chrome/browser/services/gcm/gcm_product_util.h" |
| 167 #include "chrome/browser/signin/signin_promo.h" | 168 #include "chrome/browser/signin/signin_promo.h" |
| 168 #include "chrome/browser/ui/webui/foreign_session_handler.h" | 169 #include "chrome/browser/ui/webui/foreign_session_handler.h" |
| 169 #endif | 170 #endif |
| 170 | 171 |
| 171 #if defined(OS_CHROMEOS) | 172 #if defined(OS_CHROMEOS) |
| 172 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 173 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
| 173 #include "chrome/browser/chromeos/arc/arc_auth_service.h" | 174 #include "chrome/browser/chromeos/arc/arc_auth_service.h" |
| (...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 573 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); | 574 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); |
| 574 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); | 575 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); |
| 575 first_run::RegisterProfilePrefs(registry); | 576 first_run::RegisterProfilePrefs(registry); |
| 576 NewTabUI::RegisterProfilePrefs(registry); | 577 NewTabUI::RegisterProfilePrefs(registry); |
| 577 PepperFlashSettingsManager::RegisterProfilePrefs(registry); | 578 PepperFlashSettingsManager::RegisterProfilePrefs(registry); |
| 578 PinnedTabCodec::RegisterProfilePrefs(registry); | 579 PinnedTabCodec::RegisterProfilePrefs(registry); |
| 579 signin::RegisterProfilePrefs(registry); | 580 signin::RegisterProfilePrefs(registry); |
| 580 #endif | 581 #endif |
| 581 | 582 |
| 582 #if defined(OS_ANDROID) | 583 #if defined(OS_ANDROID) |
| 584 DownloadSuggestionsProvider::RegisterProfilePrefs(registry); |
| 583 NotificationPlatformBridgeAndroid::RegisterProfilePrefs(registry); | 585 NotificationPlatformBridgeAndroid::RegisterProfilePrefs(registry); |
| 584 ntp_snippets::RecentTabSuggestionsProvider::RegisterProfilePrefs(registry); | 586 ntp_snippets::RecentTabSuggestionsProvider::RegisterProfilePrefs(registry); |
| 585 #else | 587 #else |
| 586 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); | 588 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); |
| 587 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); | 589 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); |
| 588 gcm::RegisterProfilePrefs(registry); | 590 gcm::RegisterProfilePrefs(registry); |
| 589 #endif | 591 #endif |
| 590 | 592 |
| 591 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 593 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 592 default_apps::RegisterProfilePrefs(registry); | 594 default_apps::RegisterProfilePrefs(registry); |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 776 // Added 8/2016. | 778 // Added 8/2016. |
| 777 profile_prefs->ClearPref(kStaticEncodings); | 779 profile_prefs->ClearPref(kStaticEncodings); |
| 778 profile_prefs->ClearPref(kRecentlySelectedEncoding); | 780 profile_prefs->ClearPref(kRecentlySelectedEncoding); |
| 779 | 781 |
| 780 // Added 9/2016. | 782 // Added 9/2016. |
| 781 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); | 783 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); |
| 782 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); | 784 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); |
| 783 } | 785 } |
| 784 | 786 |
| 785 } // namespace chrome | 787 } // namespace chrome |
| OLD | NEW |