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

Unified Diff: components/content_settings/core/browser/content_settings_policy_provider.cc

Issue 1417173010: Adding <keygen> Content Setting (core) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing test_runner. Created 5 years, 1 month 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
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 6d313a9e16bd9d56b3995ebe2a242e9e206a6175..1673b638e411845542a79e7b250ff12123c221b4 100644
--- a/components/content_settings/core/browser/content_settings_policy_provider.cc
+++ b/components/content_settings/core/browser/content_settings_policy_provider.cc
@@ -41,6 +41,10 @@ const PrefsForManagedContentSettingsMapEntry
CONTENT_SETTINGS_TYPE_JAVASCRIPT, CONTENT_SETTING_ALLOW},
{prefs::kManagedJavaScriptBlockedForUrls,
CONTENT_SETTINGS_TYPE_JAVASCRIPT, CONTENT_SETTING_BLOCK},
+ {prefs::kManagedKeygenAllowedForUrls,
+ CONTENT_SETTINGS_TYPE_KEYGEN, CONTENT_SETTING_ALLOW},
raymes 2015/11/05 03:15:47 Do we really want to add enterprise management for
Ryan Sleevi 2015/11/05 03:27:47 Forwarded thread. Internal enterprise use is the k
+ {prefs::kManagedKeygenBlockedForUrls,
+ CONTENT_SETTINGS_TYPE_KEYGEN, CONTENT_SETTING_BLOCK},
{prefs::kManagedNotificationsAllowedForUrls,
CONTENT_SETTINGS_TYPE_NOTIFICATIONS, CONTENT_SETTING_ALLOW},
{prefs::kManagedNotificationsBlockedForUrls,
@@ -74,6 +78,8 @@ const PolicyProvider::PrefsForManagedDefaultMapEntry
prefs::kManagedDefaultGeolocationSetting},
{CONTENT_SETTINGS_TYPE_JAVASCRIPT,
prefs::kManagedDefaultJavaScriptSetting},
+ {CONTENT_SETTINGS_TYPE_KEYGEN,
+ prefs::kManagedDefaultKeygenSetting},
{CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
prefs::kManagedDefaultMediaStreamSetting},
{CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
@@ -95,6 +101,8 @@ void PolicyProvider::RegisterProfilePrefs(
registry->RegisterListPref(prefs::kManagedImagesBlockedForUrls);
registry->RegisterListPref(prefs::kManagedJavaScriptAllowedForUrls);
registry->RegisterListPref(prefs::kManagedJavaScriptBlockedForUrls);
+ registry->RegisterListPref(prefs::kManagedKeygenAllowedForUrls);
+ registry->RegisterListPref(prefs::kManagedKeygenBlockedForUrls);
registry->RegisterListPref(prefs::kManagedNotificationsAllowedForUrls);
registry->RegisterListPref(prefs::kManagedNotificationsBlockedForUrls);
registry->RegisterListPref(prefs::kManagedPluginsAllowedForUrls);
@@ -111,6 +119,8 @@ void PolicyProvider::RegisterProfilePrefs(
CONTENT_SETTING_DEFAULT);
registry->RegisterIntegerPref(prefs::kManagedDefaultJavaScriptSetting,
CONTENT_SETTING_DEFAULT);
+ registry->RegisterIntegerPref(prefs::kManagedDefaultKeygenSetting,
+ CONTENT_SETTING_DEFAULT);
registry->RegisterIntegerPref(prefs::kManagedDefaultNotificationsSetting,
CONTENT_SETTING_DEFAULT);
registry->RegisterIntegerPref(prefs::kManagedDefaultMediaStreamSetting,
@@ -138,6 +148,8 @@ PolicyProvider::PolicyProvider(PrefService* prefs) : prefs_(prefs) {
pref_change_registrar_.Add(prefs::kManagedImagesBlockedForUrls, callback);
pref_change_registrar_.Add(prefs::kManagedJavaScriptAllowedForUrls, callback);
pref_change_registrar_.Add(prefs::kManagedJavaScriptBlockedForUrls, callback);
+ pref_change_registrar_.Add(prefs::kManagedKeygenAllowedForUrls, callback);
+ pref_change_registrar_.Add(prefs::kManagedKeygenBlockedForUrls, callback);
pref_change_registrar_.Add(
prefs::kManagedNotificationsAllowedForUrls, callback);
@@ -159,6 +171,7 @@ PolicyProvider::PolicyProvider(PrefService* prefs) : prefs_(prefs) {
prefs::kManagedDefaultGeolocationSetting, callback);
pref_change_registrar_.Add(prefs::kManagedDefaultImagesSetting, callback);
pref_change_registrar_.Add(prefs::kManagedDefaultJavaScriptSetting, callback);
+ pref_change_registrar_.Add(prefs::kManagedDefaultKeygenSetting, callback);
pref_change_registrar_.Add(
prefs::kManagedDefaultNotificationsSetting, callback);
pref_change_registrar_.Add(
@@ -390,6 +403,8 @@ void PolicyProvider::OnPreferenceChanged(const std::string& name) {
name == prefs::kManagedImagesBlockedForUrls ||
name == prefs::kManagedJavaScriptAllowedForUrls ||
name == prefs::kManagedJavaScriptBlockedForUrls ||
+ name == prefs::kManagedKeygenAllowedForUrls ||
+ name == prefs::kManagedKeygenBlockedForUrls ||
name == prefs::kManagedNotificationsAllowedForUrls ||
name == prefs::kManagedNotificationsBlockedForUrls ||
name == prefs::kManagedPluginsAllowedForUrls ||

Powered by Google App Engine
This is Rietveld 408576698