Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3273)

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 2278303002: Remove the allow-displaying-mixed-content setting from Blink. (Closed)
Patch Set: Fixed missign deprecated preference registration. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/ui/prefs/prefs_tab_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index be216fcf2079c0fce49c8aa56e465bd6e4129126..6db1e7fce11f26949713d045cfefd3ad453f84d3 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -309,6 +309,8 @@ const char kStaticEncodings[] = "intl.static_encodings";
// Deprecated 9/2016.
const char kWebKitUsesUniversalDetector[] =
"webkit.webprefs.uses_universal_detector";
+const char kWebKitAllowDisplayingInsecureContent[] =
+ "webkit.webprefs.allow_displaying_insecure_content";
void DeleteWebRTCIdentityStoreDBOnFileThread(
const base::FilePath& profile_path) {
@@ -654,6 +656,8 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterStringPref(kStaticEncodings, std::string());
registry->RegisterStringPref(kRecentlySelectedEncoding, std::string());
registry->RegisterBooleanPref(kWebKitUsesUniversalDetector, true);
+
+ registry->RegisterBooleanPref(kWebKitAllowDisplayingInsecureContent, true);
}
void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -761,6 +765,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
// Added 9/2016.
profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
+ profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
}
} // namespace chrome
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/ui/prefs/prefs_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698