Chromium Code Reviews| Index: chrome/app/policy/policy_templates.json |
| diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json |
| index c8138681167e392ddf4016388847a83ac49534a6..4459ec3c093319ab52511e70a9a8ed25d4d7ee1f 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: 207 |
| +# For your editing convenience: highest ID currently used: 209 |
| # |
| # Placeholders: |
| # The following placeholder strings are automatically substituted: |
| @@ -3800,12 +3800,35 @@ |
| 'caption': '''Allow or deny audio capture''', |
| 'desc': '''Allow or deny audio capture. |
| - When this policy is disabled, audio capture will not be available. If enabled, audio capture will always be allowed. |
| - If the policy is not configured (default), the user will be prompted for audio capture device access. |
| + If enabled or not configured (default), the user will be prompted for |
| + audio capture access except for URLs configured in the |
| + AudioCaptureAllowedUrls list which will be granted access without prompting. |
| + |
| + When this policy is disabled, the user will never be prompted and audio |
| + capture only be available to URLs configured in AudioCaptureAllowedUrls. |
| This policy affects all types of audio inputs and not only the built-in microphone.''', |
| }, |
| { |
| + 'name': 'AudioCaptureAllowedUrls', |
| + 'type': 'list', |
| + 'schema': { |
| + 'type': 'array', |
| + 'items': { 'type': 'string' }, |
| + }, |
| + 'supported_on': ['chrome.*:29-', 'chrome_os:0.29-'], |
| + 'features': { |
| + 'dynamic_refresh': True, |
| + 'per_profile': False, |
|
pastarmovj
2013/05/23 08:33:12
This is actually a per profile policy. Please chan
tommi (sloooow) - chröme
2013/05/23 12:12:17
Done.
|
| + }, |
| + 'example_value': ['http://www.example.com/', 'http://*.example.edu/'], |
| + 'id': 208, |
| + 'caption': '''URLs that will be granted access to audio capture devices without prompt.''', |
| + 'desc': '''Patterns in this list will be matched against the security |
| + origin of the requesting URL. If a match is found, access to audio |
| + capture devices will be granted without prompt.''', |
| + }, |
| + { |
| 'name': 'VideoCaptureAllowed', |
| 'type': 'main', |
| 'schema': { 'type': 'boolean' }, |
| @@ -3819,12 +3842,35 @@ |
| 'caption': '''Allow or deny video capture''', |
| 'desc': '''Allow or deny video capture. |
| - When this policy is disabled, video capture devices will not be available. If enabled, video capture will always be allowed. |
| - If the policy is not configured (default), the user will be prompted for video device access. |
| + If enabled or not configured (default), the user will be prompted for |
| + video capture access except for URLs configured in the |
| + VideoCaptureAllowedUrls list which will be granted access without prompting. |
| + |
| + When this policy is disabled, the user will never be prompted and video |
| + capture only be available to URLs configured in VideoCaptureAllowedUrls. |
| This policy affects all types of video inputs and not only the built-in camera.''', |
| }, |
| { |
| + 'name': 'VideoCaptureAllowedUrls', |
| + 'type': 'list', |
| + 'schema': { |
| + 'type': 'array', |
| + 'items': { 'type': 'string' }, |
| + }, |
| + 'supported_on': ['chrome.*:29-', 'chrome_os:0.29-'], |
| + 'features': { |
| + 'dynamic_refresh': True, |
| + 'per_profile': False, |
|
pastarmovj
2013/05/23 08:33:12
This is actually a per profile policy. Please chan
tommi (sloooow) - chröme
2013/05/23 12:12:17
Done.
|
| + }, |
| + 'example_value': ['http://www.example.com/', 'http://*.example.edu/'], |
| + 'id': 209, |
| + 'caption': '''URLs that will be granted access to video capture devices without prompt.''', |
| + 'desc': '''Patterns in this list will be matched against the security |
| + origin of the requesting URL. If a match is found, access to audio |
| + capture devices will be granted without prompt.''', |
| + }, |
| + { |
| 'name': 'DisableScreenshots', |
| 'type': 'main', |
| 'schema': { 'type': 'boolean' }, |