chrome/common/extensions/api/content_settings.json - Issue 889893002: Expose camera settings to the extensions.

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 889893002: Expose camera settings to the extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 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

« no previous file with comments | « chrome/browser/extensions/api/content_settings/content_settings_helpers.cc ('k') | chrome/test/data/extensions/api_test/content_settings/standard/test.js » ('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 9a4ca017d4e85701bb7329037157a88861f96ede..74ca7fcdc11be6183955103e27976d35be6d915d 100644

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

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

@@ -244,6 +244,14 @@

"media-stream-mic",

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

]

+ },

+ "mediaStreamCamera": {

Mike West 2015/01/30 12:07:58 Ditto for the renaming here.

+ "$ref": "ContentSetting",

+ "description": "Whether to allow sites to access the camera. One of <var>allow</var>: Allow sites to access the camera, <var>block</var>: Don't allow sites to access the camera, <var>ask</var>: Ask when a site wants to access the camera. Default is <var>ask</var>. The primary URL is the URL of the document which requested camera access. The secondary URL is not used.",

+ "value": [

+ "media-stream-camera",

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

+ ]

}