| Index: chrome/common/pref_names.cc
|
| diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
|
| index fcf8671815b32a8b1f7015cd9c5f04b4b0383432..b882b8a76577e7065cb23d803991472be63426f3 100644
|
| --- a/chrome/common/pref_names.cc
|
| +++ b/chrome/common/pref_names.cc
|
| @@ -1988,6 +1988,8 @@ const char kManagedDefaultImagesSetting[] =
|
| "profile.managed_default_content_settings.images";
|
| const char kManagedDefaultJavaScriptSetting[] =
|
| "profile.managed_default_content_settings.javascript";
|
| +const char kManagedDefaultMediaSetting[] =
|
| + "profile.managed_default_content_settings.media";
|
| const char kManagedDefaultPluginsSetting[] =
|
| "profile.managed_default_content_settings.plugins";
|
| const char kManagedDefaultPopupsSetting[] =
|
| @@ -2015,6 +2017,10 @@ const char kManagedJavaScriptAllowedForUrls[] =
|
| "profile.managed_javascript_allowed_for_urls";
|
| const char kManagedJavaScriptBlockedForUrls[] =
|
| "profile.managed_javascript_blocked_for_urls";
|
| +const char kManagedMediaAllowedForUrls[] =
|
| + "profile.managed_media_allowed_for_urls";
|
| +const char kManagedMediaBlockedForUrls[] =
|
| + "profile.managed_media_blocked_for_urls";
|
| const char kManagedPluginsAllowedForUrls[] =
|
| "profile.managed_plugins_allowed_for_urls";
|
| const char kManagedPluginsBlockedForUrls[] =
|
|
|