| 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_whitelist_service.h" | 149 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" |
| 150 #endif | 150 #endif |
| 151 | 151 |
| 152 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) | 152 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) |
| 153 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" | 153 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" |
| 154 #endif | 154 #endif |
| 155 | 155 |
| 156 #if BUILDFLAG(ANDROID_JAVA_UI) | 156 #if BUILDFLAG(ANDROID_JAVA_UI) |
| 157 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" | 157 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" |
| 158 #include "chrome/browser/android/ntp/new_tab_page_prefs.h" | 158 #include "chrome/browser/android/ntp/new_tab_page_prefs.h" |
| 159 #include "components/ntp_tiles/popular_sites.h" | 159 #include "components/ntp_tiles/popular_sites_impl.h" |
| 160 #else | 160 #else |
| 161 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 161 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| 162 #include "chrome/browser/upgrade_detector.h" | 162 #include "chrome/browser/upgrade_detector.h" |
| 163 #endif | 163 #endif |
| 164 | 164 |
| 165 #if defined(OS_ANDROID) | 165 #if defined(OS_ANDROID) |
| 166 #include "chrome/browser/android/preferences/browser_prefs_android.h" | 166 #include "chrome/browser/android/preferences/browser_prefs_android.h" |
| 167 #include "chrome/browser/ntp_snippets/download_suggestions_provider.h" | 167 #include "chrome/browser/ntp_snippets/download_suggestions_provider.h" |
| 168 #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider.
h" | 168 #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider.
h" |
| 169 #include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestio
ns_provider.h" | 169 #include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestio
ns_provider.h" |
| (...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 790 // Added 8/2016. | 790 // Added 8/2016. |
| 791 profile_prefs->ClearPref(kStaticEncodings); | 791 profile_prefs->ClearPref(kStaticEncodings); |
| 792 profile_prefs->ClearPref(kRecentlySelectedEncoding); | 792 profile_prefs->ClearPref(kRecentlySelectedEncoding); |
| 793 | 793 |
| 794 // Added 9/2016. | 794 // Added 9/2016. |
| 795 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); | 795 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); |
| 796 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); | 796 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); |
| 797 } | 797 } |
| 798 | 798 |
| 799 } // namespace chrome | 799 } // namespace chrome |
| OLD | NEW |