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