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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
157 #if BUILDFLAG(ANDROID_JAVA_UI) | 157 #if BUILDFLAG(ANDROID_JAVA_UI) |
158 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" | 158 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" |
159 #include "chrome/browser/android/ntp/new_tab_page_prefs.h" | 159 #include "chrome/browser/android/ntp/new_tab_page_prefs.h" |
160 #include "components/ntp_tiles/popular_sites_impl.h" | 160 #include "components/ntp_tiles/popular_sites_impl.h" |
161 #else | 161 #else |
162 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 162 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
163 #include "chrome/browser/upgrade_detector.h" | 163 #include "chrome/browser/upgrade_detector.h" |
164 #endif | 164 #endif |
165 | 165 |
166 #if defined(OS_ANDROID) | 166 #if defined(OS_ANDROID) |
167 #include "chrome/browser/android/ntp/content_suggestions_notifier_service.h" | |
167 #include "chrome/browser/android/preferences/browser_prefs_android.h" | 168 #include "chrome/browser/android/preferences/browser_prefs_android.h" |
168 #include "chrome/browser/ntp_snippets/download_suggestions_provider.h" | 169 #include "chrome/browser/ntp_snippets/download_suggestions_provider.h" |
169 #include "components/ntp_snippets/category_rankers/click_based_category_ranker.h " | 170 #include "components/ntp_snippets/category_rankers/click_based_category_ranker.h " |
170 #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider. h" | 171 #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider. h" |
171 #include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestio ns_provider.h" | 172 #include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestio ns_provider.h" |
172 #else | 173 #else |
173 #include "chrome/browser/services/gcm/gcm_product_util.h" | 174 #include "chrome/browser/services/gcm/gcm_product_util.h" |
174 #include "chrome/browser/signin/signin_promo.h" | 175 #include "chrome/browser/signin/signin_promo.h" |
175 #include "chrome/browser/ui/webui/foreign_session_handler.h" | 176 #include "chrome/browser/ui/webui/foreign_session_handler.h" |
176 #endif | 177 #endif |
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
585 first_run::RegisterProfilePrefs(registry); | 586 first_run::RegisterProfilePrefs(registry); |
586 NewTabUI::RegisterProfilePrefs(registry); | 587 NewTabUI::RegisterProfilePrefs(registry); |
587 PepperFlashSettingsManager::RegisterProfilePrefs(registry); | 588 PepperFlashSettingsManager::RegisterProfilePrefs(registry); |
588 PinnedTabCodec::RegisterProfilePrefs(registry); | 589 PinnedTabCodec::RegisterProfilePrefs(registry); |
589 signin::RegisterProfilePrefs(registry); | 590 signin::RegisterProfilePrefs(registry); |
590 #endif | 591 #endif |
591 | 592 |
592 #if defined(OS_ANDROID) | 593 #if defined(OS_ANDROID) |
593 DownloadSuggestionsProvider::RegisterProfilePrefs(registry); | 594 DownloadSuggestionsProvider::RegisterProfilePrefs(registry); |
594 ntp_snippets::ClickBasedCategoryRanker::RegisterProfilePrefs(registry); | 595 ntp_snippets::ClickBasedCategoryRanker::RegisterProfilePrefs(registry); |
596 ContentSuggestionsNotifierService::RegisterProfilePrefs(registry); | |
Bernhard Bauer
2017/01/03 17:38:59
Move this before DownloadSuggestionsProvider, so e
sfiera
2017/01/03 23:13:55
Done.
I wonder how this ordering happened, it rea
| |
595 ntp_snippets::PhysicalWebPageSuggestionsProvider::RegisterProfilePrefs( | 597 ntp_snippets::PhysicalWebPageSuggestionsProvider::RegisterProfilePrefs( |
596 registry); | 598 registry); |
597 ntp_snippets::RecentTabSuggestionsProvider::RegisterProfilePrefs(registry); | 599 ntp_snippets::RecentTabSuggestionsProvider::RegisterProfilePrefs(registry); |
598 #endif // defined(OS_ANDROID) | 600 #endif // defined(OS_ANDROID) |
599 | 601 |
600 #if !defined(OS_ANDROID) | 602 #if !defined(OS_ANDROID) |
601 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); | 603 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); |
602 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); | 604 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); |
603 gcm::RegisterProfilePrefs(registry); | 605 gcm::RegisterProfilePrefs(registry); |
604 StartupBrowserCreator::RegisterProfilePrefs(registry); | 606 StartupBrowserCreator::RegisterProfilePrefs(registry); |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
795 // Added 8/2016. | 797 // Added 8/2016. |
796 profile_prefs->ClearPref(kStaticEncodings); | 798 profile_prefs->ClearPref(kStaticEncodings); |
797 profile_prefs->ClearPref(kRecentlySelectedEncoding); | 799 profile_prefs->ClearPref(kRecentlySelectedEncoding); |
798 | 800 |
799 // Added 9/2016. | 801 // Added 9/2016. |
800 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); | 802 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); |
801 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); | 803 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); |
802 } | 804 } |
803 | 805 |
804 } // namespace chrome | 806 } // namespace chrome |
OLD | NEW |