Chromium Code Reviews| 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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 149 #include "chrome/browser/supervised_user/supervised_user_service.h" | 149 #include "chrome/browser/supervised_user/supervised_user_service.h" |
| 150 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" | 150 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" |
| 151 #endif | 151 #endif |
| 152 | 152 |
| 153 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) | 153 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) |
| 154 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" | 154 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" |
| 155 #endif | 155 #endif |
| 156 | 156 |
| 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/recent_tabs_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/preferences/browser_prefs_android.h" | 167 #include "chrome/browser/android/preferences/browser_prefs_android.h" |
| 168 #include "chrome/browser/ntp_snippets/download_suggestions_provider.h" | 168 #include "chrome/browser/ntp_snippets/download_suggestions_provider.h" |
| 169 #include "components/ntp_snippets/category_rankers/click_based_category_ranker.h " | 169 #include "components/ntp_snippets/category_rankers/click_based_category_ranker.h " |
| (...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 562 SupervisedUserSyncService::RegisterProfilePrefs(registry); | 562 SupervisedUserSyncService::RegisterProfilePrefs(registry); |
| 563 #endif | 563 #endif |
| 564 ChildAccountService::RegisterProfilePrefs(registry); | 564 ChildAccountService::RegisterProfilePrefs(registry); |
| 565 SupervisedUserService::RegisterProfilePrefs(registry); | 565 SupervisedUserService::RegisterProfilePrefs(registry); |
| 566 SupervisedUserWhitelistService::RegisterProfilePrefs(registry); | 566 SupervisedUserWhitelistService::RegisterProfilePrefs(registry); |
| 567 #endif | 567 #endif |
| 568 | 568 |
| 569 #if BUILDFLAG(ANDROID_JAVA_UI) | 569 #if BUILDFLAG(ANDROID_JAVA_UI) |
| 570 variations::VariationsService::RegisterProfilePrefs(registry); | 570 variations::VariationsService::RegisterProfilePrefs(registry); |
| 571 ntp_tiles::PopularSitesImpl::RegisterProfilePrefs(registry); | 571 ntp_tiles::PopularSitesImpl::RegisterProfilePrefs(registry); |
| 572 NewTabPagePrefs::RegisterProfilePrefs(registry); | 572 RecentTabsPagePrefs::RegisterProfilePrefs(registry); |
|
Bernhard Bauer
2017/01/05 17:50:00
Can you move this to after PartnerBookmarksShim, a
Michael van Ouwerkerk
2017/01/06 10:23:11
Done.
| |
| 573 PartnerBookmarksShim::RegisterProfilePrefs(registry); | 573 PartnerBookmarksShim::RegisterProfilePrefs(registry); |
| 574 #else | 574 #else |
| 575 AppShortcutManager::RegisterProfilePrefs(registry); | 575 AppShortcutManager::RegisterProfilePrefs(registry); |
| 576 DeviceIDFetcher::RegisterProfilePrefs(registry); | 576 DeviceIDFetcher::RegisterProfilePrefs(registry); |
| 577 DevToolsWindow::RegisterProfilePrefs(registry); | 577 DevToolsWindow::RegisterProfilePrefs(registry); |
| 578 #if BUILDFLAG(ENABLE_APP_LIST) | 578 #if BUILDFLAG(ENABLE_APP_LIST) |
| 579 DriveAppMapping::RegisterProfilePrefs(registry); | 579 DriveAppMapping::RegisterProfilePrefs(registry); |
| 580 app_list::AppListSyncableService::RegisterProfilePrefs(registry); | 580 app_list::AppListSyncableService::RegisterProfilePrefs(registry); |
| 581 #endif | 581 #endif |
| 582 extensions::CommandService::RegisterProfilePrefs(registry); | 582 extensions::CommandService::RegisterProfilePrefs(registry); |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 795 // Added 8/2016. | 795 // Added 8/2016. |
| 796 profile_prefs->ClearPref(kStaticEncodings); | 796 profile_prefs->ClearPref(kStaticEncodings); |
| 797 profile_prefs->ClearPref(kRecentlySelectedEncoding); | 797 profile_prefs->ClearPref(kRecentlySelectedEncoding); |
| 798 | 798 |
| 799 // Added 9/2016. | 799 // Added 9/2016. |
| 800 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); | 800 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); |
| 801 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); | 801 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); |
| 802 } | 802 } |
| 803 | 803 |
| 804 } // namespace chrome | 804 } // namespace chrome |
| OLD | NEW |