chrome/browser/ui/website_settings/website_settings.cc - Issue 1414853003: Add options for audio/video autoplay to chrome://settings/content.

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/website_settings/website_settings.cc

Issue 1414853003: Add options for audio/video autoplay to chrome://settings/content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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/resources/options/content_settings_exceptions_area.html ('K') | « chrome/browser/resources/options/content_settings_exceptions_area.html ('k') | chrome/browser/ui/website_settings/website_settings_ui.cc » ('j') | chrome/renderer/chrome_content_renderer_client.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/website_settings/website_settings.cc

diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc

index 767fc98a18d67e12918414b24a5797d42d90ab39..8d0e188b566377e0bd07a89425b227965c76d275 100644

--- a/chrome/browser/ui/website_settings/website_settings.cc

+++ b/chrome/browser/ui/website_settings/website_settings.cc

@@ -95,6 +95,7 @@ ContentSettingsType kPermissionType[] = {

#if defined(OS_ANDROID)

CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,

#endif

+ CONTENT_SETTINGS_TYPE_MEDIA_AUTOPLAY,

};

bool CertificateTransparencyStatusMatch(

@@ -281,7 +282,8 @@ void WebsiteSettings::OnSitePermissionChanged(ContentSettingsType type,

type == CONTENT_SETTINGS_TYPE_POPUPS ||

type == CONTENT_SETTINGS_TYPE_MOUSELOCK ||

type == CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS ||

- type == CONTENT_SETTINGS_TYPE_PUSH_MESSAGING) {

+ type == CONTENT_SETTINGS_TYPE_PUSH_MESSAGING ||

+ type == CONTENT_SETTINGS_TYPE_MEDIA_AUTOPLAY) {

primary_pattern = ContentSettingsPattern::FromURL(site_url_);

secondary_pattern = ContentSettingsPattern::Wildcard();

} else if (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ||