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

Unified Diff: chrome/app/policy/policy_templates.json

Issue 10537099: add "always allow" option to the mediastream infobar and allow user to allow/not allow acces to devi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed sky's comment and replaced "Do not allow any site to" with "Do not allow sites to" Created 8 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/automation/testing_automation_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/policy/policy_templates.json
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index cf3e069b4f14600f79d9ee4218e5887a7718223f..fd9e75e450e0df62b37363249cb2661bdc16e562 100644
--- a/chrome/app/policy/policy_templates.json
+++ b/chrome/app/policy/policy_templates.json
@@ -112,7 +112,7 @@
# persistent IDs for all fields (but not for groups!) are needed. These are
# specified by the 'id' keys of each policy. NEVER CHANGE EXISTING IDs,
# because doing so would break the deployed wire format!
-# For your editing convenience: highest ID currently used: 148
+# For your editing convenience: highest ID currently used: 149
#
# Placeholders:
# The following placeholder strings are automatically substituted:
@@ -1557,6 +1557,30 @@
If this policy is left not set, 'AskGeolocation' will be used and the user will be able to change it.''',
},
{
+ 'name': 'DefaultMediaStreamSetting',
+ 'type': 'int-enum',
+ 'items': [
+ {
+ 'name': 'PromptOnAccess',
+ 'value': 1,
+ 'caption': '''Ask every time a site wants to access my camera and/or microphone'''
+ },
+ {
+ 'name': 'BlockAccess',
+ 'value': 2,
+ 'caption': '''Do not allow any site to access my camera and microphone'''
+ },
+ ],
+ 'supported_on': ['chrome.*:22-', 'chrome_os:0.22-'],
+ 'features': {'dynamic_refresh': True},
+ 'example_value': 2,
+ 'id': 149,
+ 'caption': '''Default mediastream setting''',
+ 'desc': '''Allows you to set whether websites are allowed to get access to media capture devices. Access to media capture devices can be allowed by default, or the user can be asked every time a website wants to get access to media capture devices.
+
+ If this policy is left not set, 'PromptOnAccess' will be used and the user will be able to change it.''',
+ },
+ {
'name': 'AutoSelectCertificateForUrls',
'type': 'list',
'supported_on': ['chrome.*:15-', 'chrome_os:0.15-'],
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/automation/testing_automation_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698