| 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" | 150 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" |
| 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/android/preferences/browser_android_prefs.h" |
| 161 #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider.
h" | |
| 162 #else | 161 #else |
| 163 #include "chrome/browser/services/gcm/gcm_product_util.h" | 162 #include "chrome/browser/services/gcm/gcm_product_util.h" |
| 164 #include "chrome/browser/signin/signin_promo.h" | 163 #include "chrome/browser/signin/signin_promo.h" |
| 165 #include "chrome/browser/ui/webui/foreign_session_handler.h" | 164 #include "chrome/browser/ui/webui/foreign_session_handler.h" |
| 166 #endif | 165 #endif |
| 167 | 166 |
| 168 #if defined(OS_CHROMEOS) | 167 #if defined(OS_CHROMEOS) |
| 169 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 168 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
| 170 #include "chrome/browser/chromeos/arc/arc_auth_service.h" | 169 #include "chrome/browser/chromeos/arc/arc_auth_service.h" |
| 171 #include "chrome/browser/chromeos/customization/customization_document.h" | 170 #include "chrome/browser/chromeos/customization/customization_document.h" |
| (...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 568 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); | 567 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); |
| 569 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); | 568 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); |
| 570 first_run::RegisterProfilePrefs(registry); | 569 first_run::RegisterProfilePrefs(registry); |
| 571 NewTabUI::RegisterProfilePrefs(registry); | 570 NewTabUI::RegisterProfilePrefs(registry); |
| 572 PepperFlashSettingsManager::RegisterProfilePrefs(registry); | 571 PepperFlashSettingsManager::RegisterProfilePrefs(registry); |
| 573 PinnedTabCodec::RegisterProfilePrefs(registry); | 572 PinnedTabCodec::RegisterProfilePrefs(registry); |
| 574 signin::RegisterProfilePrefs(registry); | 573 signin::RegisterProfilePrefs(registry); |
| 575 #endif | 574 #endif |
| 576 | 575 |
| 577 #if defined(OS_ANDROID) | 576 #if defined(OS_ANDROID) |
| 578 NotificationPlatformBridgeAndroid::RegisterProfilePrefs(registry); | 577 ::android::RegisterProfilePrefs(registry); |
| 579 ntp_snippets::RecentTabSuggestionsProvider::RegisterProfilePrefs(registry); | |
| 580 #else | 578 #else |
| 581 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); | 579 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); |
| 582 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); | 580 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); |
| 583 gcm::RegisterProfilePrefs(registry); | 581 gcm::RegisterProfilePrefs(registry); |
| 584 #endif | 582 #endif |
| 585 | 583 |
| 586 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 584 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 587 default_apps::RegisterProfilePrefs(registry); | 585 default_apps::RegisterProfilePrefs(registry); |
| 588 #endif | 586 #endif |
| 589 | 587 |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 771 // Added 8/2016. | 769 // Added 8/2016. |
| 772 profile_prefs->ClearPref(kStaticEncodings); | 770 profile_prefs->ClearPref(kStaticEncodings); |
| 773 profile_prefs->ClearPref(kRecentlySelectedEncoding); | 771 profile_prefs->ClearPref(kRecentlySelectedEncoding); |
| 774 | 772 |
| 775 // Added 9/2016. | 773 // Added 9/2016. |
| 776 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); | 774 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); |
| 777 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); | 775 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); |
| 778 } | 776 } |
| 779 | 777 |
| 780 } // namespace chrome | 778 } // namespace chrome |
| OLD | NEW |