chrome/browser/ui/content_settings/content_setting_image_model.cc - Issue 27635002: Content settings for <audio> and <video>.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/content_settings/content_setting_image_model.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

« chrome/browser/prefs/pref_functional_browsertest.cc ('K') | « chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc ('k') | chrome/browser/ui/website_settings/website_settings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/content_settings/content_setting_image_model.cc

diff --git a/chrome/browser/ui/content_settings/content_setting_image_model.cc b/chrome/browser/ui/content_settings/content_setting_image_model.cc

index 6b14bfe5a2095ae2a29c32007533b0a77be28ff8..84729481408adc3ffbcbefb422f785fe46df2a1f 100644

--- a/chrome/browser/ui/content_settings/content_setting_image_model.cc

+++ b/chrome/browser/ui/content_settings/content_setting_image_model.cc

@@ -93,6 +93,7 @@ void ContentSettingBlockedImageModel::UpdateFromWebContents(

{CONTENT_SETTINGS_TYPE_COOKIES, IDR_BLOCKED_COOKIES},

{CONTENT_SETTINGS_TYPE_IMAGES, IDR_BLOCKED_IMAGES},

{CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDR_BLOCKED_JAVASCRIPT},

+ {CONTENT_SETTINGS_TYPE_MEDIA, IDR_BLOCKED_MEDIA},

{CONTENT_SETTINGS_TYPE_PLUGINS, IDR_BLOCKED_PLUGINS},

{CONTENT_SETTINGS_TYPE_POPUPS, IDR_BLOCKED_POPUPS},

{CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, IDR_BLOCKED_MIXED_CONTENT},

@@ -103,6 +104,7 @@ void ContentSettingBlockedImageModel::UpdateFromWebContents(

{CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_TITLE},

{CONTENT_SETTINGS_TYPE_IMAGES, IDS_BLOCKED_IMAGES_TITLE},

{CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_BLOCKED_JAVASCRIPT_TITLE},

+ {CONTENT_SETTINGS_TYPE_MEDIA, IDS_BLOCKED_MEDIA_TITLE},

{CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_MESSAGE},

{CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_TOOLTIP},

{CONTENT_SETTINGS_TYPE_MIXEDSCRIPT,

@@ -266,15 +268,15 @@ void ContentSettingMediaImageModel::UpdateFromWebContents(

set_tooltip(l10n_util::GetStringUTF8(IDS_MICROPHONE_CAMERA_ALLOWED));

break;

case TabSpecificContentSettings::MICROPHONE_BLOCKED:

- set_icon(IDR_BLOCKED_MEDIA);

+ set_icon(IDR_BLOCKED_MEDIASTREAM);

set_tooltip(l10n_util::GetStringUTF8(IDS_MICROPHONE_BLOCKED));

break;

case TabSpecificContentSettings::CAMERA_BLOCKED:

- set_icon(IDR_BLOCKED_MEDIA);

+ set_icon(IDR_BLOCKED_MEDIASTREAM);

set_tooltip(l10n_util::GetStringUTF8(IDS_CAMERA_BLOCKED));

break;

case TabSpecificContentSettings::MICROPHONE_CAMERA_BLOCKED:

- set_icon(IDR_BLOCKED_MEDIA);

+ set_icon(IDR_BLOCKED_MEDIASTREAM);

set_tooltip(l10n_util::GetStringUTF8(IDS_MICROPHONE_CAMERA_BLOCKED));

break;

}