Index: components/content_settings/core/browser/content_settings_policy_provider.cc |
diff --git a/components/content_settings/core/browser/content_settings_policy_provider.cc b/components/content_settings/core/browser/content_settings_policy_provider.cc |
index 8a7587ba070bceb627f392fea8141f1c52aef837..81a059b6e0ddab617c1100274ba45f552bbdb3db 100644 |
--- a/components/content_settings/core/browser/content_settings_policy_provider.cc |
+++ b/components/content_settings/core/browser/content_settings_policy_provider.cc |
@@ -55,11 +55,7 @@ const PrefsForManagedContentSettingsMapEntry |
{prefs::kManagedPopupsAllowedForUrls, CONTENT_SETTINGS_TYPE_POPUPS, |
CONTENT_SETTING_ALLOW}, |
{prefs::kManagedPopupsBlockedForUrls, CONTENT_SETTINGS_TYPE_POPUPS, |
- CONTENT_SETTING_BLOCK}, |
- {prefs::kManagedKeygenAllowedForUrls, |
- CONTENT_SETTINGS_TYPE_KEYGEN, CONTENT_SETTING_ALLOW}, |
- {prefs::kManagedKeygenBlockedForUrls, |
- CONTENT_SETTINGS_TYPE_KEYGEN, CONTENT_SETTING_BLOCK}}; |
+ CONTENT_SETTING_BLOCK}}; |
} // namespace |
@@ -89,7 +85,6 @@ const PolicyProvider::PrefsForManagedDefaultMapEntry |
prefs::kManagedDefaultNotificationsSetting}, |
{CONTENT_SETTINGS_TYPE_PLUGINS, prefs::kManagedDefaultPluginsSetting}, |
{CONTENT_SETTINGS_TYPE_POPUPS, prefs::kManagedDefaultPopupsSetting}, |
- {CONTENT_SETTINGS_TYPE_KEYGEN, prefs::kManagedDefaultKeygenSetting}, |
{CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD, |
prefs::kManagedDefaultWebBluetoothGuardSetting}, |
}; |
@@ -111,8 +106,6 @@ void PolicyProvider::RegisterProfilePrefs( |
registry->RegisterListPref(prefs::kManagedPluginsBlockedForUrls); |
registry->RegisterListPref(prefs::kManagedPopupsAllowedForUrls); |
registry->RegisterListPref(prefs::kManagedPopupsBlockedForUrls); |
- registry->RegisterListPref(prefs::kManagedKeygenAllowedForUrls); |
- registry->RegisterListPref(prefs::kManagedKeygenBlockedForUrls); |
// Preferences for default content setting policies. If a policy is not set of |
// the corresponding preferences below is set to CONTENT_SETTING_DEFAULT. |
registry->RegisterIntegerPref(prefs::kManagedDefaultCookiesSetting, |
@@ -131,8 +124,6 @@ void PolicyProvider::RegisterProfilePrefs( |
CONTENT_SETTING_DEFAULT); |
registry->RegisterIntegerPref(prefs::kManagedDefaultPopupsSetting, |
CONTENT_SETTING_DEFAULT); |
- registry->RegisterIntegerPref(prefs::kManagedDefaultKeygenSetting, |
- CONTENT_SETTING_DEFAULT); |
registry->RegisterIntegerPref(prefs::kManagedDefaultWebBluetoothGuardSetting, |
CONTENT_SETTING_DEFAULT); |
} |
@@ -162,8 +153,6 @@ PolicyProvider::PolicyProvider(PrefService* prefs) : prefs_(prefs) { |
pref_change_registrar_.Add(prefs::kManagedPluginsBlockedForUrls, callback); |
pref_change_registrar_.Add(prefs::kManagedPopupsAllowedForUrls, callback); |
pref_change_registrar_.Add(prefs::kManagedPopupsBlockedForUrls, callback); |
- pref_change_registrar_.Add(prefs::kManagedKeygenAllowedForUrls, callback); |
- pref_change_registrar_.Add(prefs::kManagedKeygenBlockedForUrls, callback); |
// The following preferences are only used to indicate if a default content |
// setting is managed and to hold the managed default setting value. If the |
// value for any of the following preferences is set then the corresponding |
@@ -182,7 +171,6 @@ PolicyProvider::PolicyProvider(PrefService* prefs) : prefs_(prefs) { |
prefs::kManagedDefaultMediaStreamSetting, callback); |
pref_change_registrar_.Add(prefs::kManagedDefaultPluginsSetting, callback); |
pref_change_registrar_.Add(prefs::kManagedDefaultPopupsSetting, callback); |
- pref_change_registrar_.Add(prefs::kManagedDefaultKeygenSetting, callback); |
pref_change_registrar_.Add(prefs::kManagedDefaultWebBluetoothGuardSetting, |
callback); |
} |
@@ -428,9 +416,7 @@ void PolicyProvider::OnPreferenceChanged(const std::string& name) { |
name == prefs::kManagedPluginsAllowedForUrls || |
name == prefs::kManagedPluginsBlockedForUrls || |
name == prefs::kManagedPopupsAllowedForUrls || |
- name == prefs::kManagedPopupsBlockedForUrls || |
- name == prefs::kManagedKeygenAllowedForUrls || |
- name == prefs::kManagedKeygenBlockedForUrls) { |
+ name == prefs::kManagedPopupsBlockedForUrls) { |
ReadManagedContentSettings(true); |
ReadManagedDefaultSettings(); |
} |