Index: chrome/app/policy/policy_templates.json |
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json |
index 359491483d7fcc463fb54b8d2757736ca191788e..d4bc90bb88dcaa00412491254b538c3a04f4b685 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: |
@@ -1553,6 +1553,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.*:10-', 'chrome_os:0.11-'], |
+ '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, 'AskMediaStream' will be used and the user will be able to change it.''', |
+ }, |
+ { |
'name': 'AutoSelectCertificateForUrls', |
'type': 'list', |
'supported_on': ['chrome.*:15-', 'chrome_os:0.15-'], |