Content settings for <audio> and <video>.

chrome/browser/content_settings/content_settings_policy_provider.cc

Index: chrome/browser/content_settings/content_settings_policy_provider.cc
diff --git a/chrome/browser/content_settings/content_settings_policy_provider.cc b/chrome/browser/content_settings/content_settings_policy_provider.cc
index 0fedcd6b12b0744c97d162b7630b2876cf384b22..c2ae5ece92be79844f2ee34e594b68fed637160c 100644
--- a/chrome/browser/content_settings/content_settings_policy_provider.cc
+++ b/chrome/browser/content_settings/content_settings_policy_provider.cc
@@ -29,6 +29,7 @@ const char* kPrefToManageType[] = {
   prefs::kManagedDefaultCookiesSetting,
   prefs::kManagedDefaultImagesSetting,
   prefs::kManagedDefaultJavaScriptSetting,
+  prefs::kManagedDefaultMediaSetting,

[Bernhard Bauer, 2014/07/01 09:12:50]

Not all of these are immediately necessary. The changes in this file for example
are if we want enterprise policy support for these content settings (which is
something we don't have for all content settings). It might make sense to pull
these out into a separate CL that someone from the enterprise team can then look
at.

   prefs::kManagedDefaultPluginsSetting,
   prefs::kManagedDefaultPopupsSetting,
   prefs::kManagedDefaultGeolocationSetting,
@@ -94,6 +95,14 @@ const PrefsForManagedContentSettingsMapEntry
     CONTENT_SETTINGS_TYPE_JAVASCRIPT,
     CONTENT_SETTING_BLOCK
   }, {
+    prefs::kManagedMediaAllowedForUrls,
+    CONTENT_SETTINGS_TYPE_MEDIA,
+    CONTENT_SETTING_ALLOW
+  }, {
+    prefs::kManagedMediaBlockedForUrls,
+    CONTENT_SETTINGS_TYPE_MEDIA,
+    CONTENT_SETTING_BLOCK
+  }, {
     prefs::kManagedPluginsAllowedForUrls,
     CONTENT_SETTINGS_TYPE_PLUGINS,
     CONTENT_SETTING_ALLOW
@@ -143,6 +152,10 @@ void PolicyProvider::RegisterProfilePrefs(
                              user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterListPref(prefs::kManagedJavaScriptBlockedForUrls,
                              user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterListPref(prefs::kManagedMediaAllowedForUrls,
+                             user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterListPref(prefs::kManagedMediaBlockedForUrls,
+                             user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterListPref(prefs::kManagedPluginsAllowedForUrls,
                              user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterListPref(prefs::kManagedPluginsBlockedForUrls,
@@ -170,6 +183,10 @@ void PolicyProvider::RegisterProfilePrefs(
       CONTENT_SETTING_DEFAULT,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(
+      prefs::kManagedDefaultMediaSetting,
+      CONTENT_SETTING_DEFAULT,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterIntegerPref(
       prefs::kManagedDefaultPluginsSetting,
       CONTENT_SETTING_DEFAULT,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
@@ -208,6 +225,8 @@ PolicyProvider::PolicyProvider(PrefService* prefs) : prefs_(prefs) {
   pref_change_registrar_.Add(prefs::kManagedImagesAllowedForUrls, callback);
   pref_change_registrar_.Add(prefs::kManagedJavaScriptBlockedForUrls, callback);
   pref_change_registrar_.Add(prefs::kManagedJavaScriptAllowedForUrls, callback);
+  pref_change_registrar_.Add(prefs::kManagedMediaBlockedForUrls, callback);
+  pref_change_registrar_.Add(prefs::kManagedMediaAllowedForUrls, callback);
   pref_change_registrar_.Add(prefs::kManagedPluginsBlockedForUrls, callback);
   pref_change_registrar_.Add(prefs::kManagedPluginsAllowedForUrls, callback);
   pref_change_registrar_.Add(prefs::kManagedPopupsBlockedForUrls, callback);
@@ -226,6 +245,7 @@ PolicyProvider::PolicyProvider(PrefService* prefs) : prefs_(prefs) {
   pref_change_registrar_.Add(prefs::kManagedDefaultCookiesSetting, callback);
   pref_change_registrar_.Add(prefs::kManagedDefaultImagesSetting, callback);
   pref_change_registrar_.Add(prefs::kManagedDefaultJavaScriptSetting, callback);
+  pref_change_registrar_.Add(prefs::kManagedDefaultMediaSetting, callback);
   pref_change_registrar_.Add(prefs::kManagedDefaultPluginsSetting, callback);
   pref_change_registrar_.Add(prefs::kManagedDefaultPopupsSetting, callback);
   pref_change_registrar_.Add(
@@ -464,6 +484,8 @@ void PolicyProvider::OnPreferenceChanged(const std::string& name) {
     UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_IMAGES);
   } else if (name == prefs::kManagedDefaultJavaScriptSetting) {
     UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_JAVASCRIPT);
+  } else if (name == prefs::kManagedDefaultMediaSetting) {
+    UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_MEDIA);
   } else if (name == prefs::kManagedDefaultPluginsSetting) {
     UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_PLUGINS);
   } else if (name == prefs::kManagedDefaultPopupsSetting) {
@@ -482,6 +504,8 @@ void PolicyProvider::OnPreferenceChanged(const std::string& name) {
              name == prefs::kManagedImagesBlockedForUrls ||
              name == prefs::kManagedJavaScriptAllowedForUrls ||
              name == prefs::kManagedJavaScriptBlockedForUrls ||
+             name == prefs::kManagedMediaAllowedForUrls ||
+             name == prefs::kManagedMediaBlockedForUrls ||
              name == prefs::kManagedPluginsAllowedForUrls ||
              name == prefs::kManagedPluginsBlockedForUrls ||
              name == prefs::kManagedPopupsAllowedForUrls ||