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

Unified Diff: chrome/browser/ui/website_settings/website_settings_ui.cc

Issue 27635002: Content settings for <audio> and <video>. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test fix. Created 6 years, 6 months 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: chrome/browser/ui/website_settings/website_settings_ui.cc
diff --git a/chrome/browser/ui/website_settings/website_settings_ui.cc b/chrome/browser/ui/website_settings/website_settings_ui.cc
index ad5c738cccb3b24c63b49e19c8f9ee8d79a69273..477c02a8dc292ba09b47fc1acb0a6f83c6385592 100644
--- a/chrome/browser/ui/website_settings/website_settings_ui.cc
+++ b/chrome/browser/ui/website_settings/website_settings_ui.cc
@@ -111,6 +111,8 @@ base::string16 WebsiteSettingsUI::PermissionTypeToUIString(
return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TYPE_IMAGES);
case CONTENT_SETTINGS_TYPE_JAVASCRIPT:
return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TYPE_JAVASCRIPT);
+ case CONTENT_SETTINGS_TYPE_MEDIA:
+ return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TYPE_MEDIA);
case CONTENT_SETTINGS_TYPE_POPUPS:
return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TYPE_POPUPS);
case CONTENT_SETTINGS_TYPE_PLUGINS:
@@ -199,6 +201,9 @@ int WebsiteSettingsUI::GetPermissionIconID(ContentSettingsType type,
resource_id =
use_blocked ? IDR_BLOCKED_JAVASCRIPT : IDR_ALLOWED_JAVASCRIPT;
break;
+ case CONTENT_SETTINGS_TYPE_MEDIA:
+ resource_id = use_blocked ? IDR_BLOCKED_MEDIA : IDR_ALLOWED_MEDIA;
+ break;
case CONTENT_SETTINGS_TYPE_COOKIES:
resource_id = use_blocked ? IDR_BLOCKED_COOKIES : IDR_ACCESSED_COOKIES;
break;

Powered by Google App Engine
This is Rietveld 408576698