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 |