chrome/common/extensions/api/content_settings.json - 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/common/extensions/api/content_settings.json

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/common/content_settings_types.h ('k') | chrome/common/extensions/docs/examples/api/contentSettings/popup.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/api/content_settings.json

diff --git a/chrome/common/extensions/api/content_settings.json b/chrome/common/extensions/api/content_settings.json

index 5d21a7030eb98e8ce1e3d3f7e40d1f5bc9cca198..ffebaf52fef1ed7ca38991bb15871b3121fa68b0 100644

--- a/chrome/common/extensions/api/content_settings.json

+++ b/chrome/common/extensions/api/content_settings.json

@@ -197,6 +197,14 @@

{"type":"string", "enum": ["allow", "block"]}

]

+ "media": {

+ "$ref": "ContentSetting",

+ "description": "Whether to show HTML5 media (<audio>, <video>). One of <var>allow</var>: Show media, <var>block</var>: Don't show media. Default is <var>allow</var>. The primary URL is the main-frame URL. The secondary URL is the URL of the media.",

+ "value": [

+ "media",

+ {"type":"string", "enum": ["allow", "block"]}

+ ]

+ },

"plugins": {

"$ref": "ContentSetting",

"description": "Whether to run plug-ins. One of <var>allow</var>: Run plug-ins automatically, <var>block</var>: Don't run plug-ins automatically. Default is <var>allow</var>. The primary URL is the main-frame URL. The secondary URL is not used.",