diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-13 14:19:57 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-13 14:19:57 +0000 |
| commit | 874ec6c44739babd348b6bdf9eaa25342c4bcac2 (patch) | |
| tree | 8ec30703cc832495b79c60633ca7512d24a276d3 /chrome/app/policy | |
| parent | c5d355a7ed2d1a57a6b9f140605e70515d45182a (diff) | |
| download | chromium_src-874ec6c44739babd348b6bdf9eaa25342c4bcac2.zip chromium_src-874ec6c44739babd348b6bdf9eaa25342c4bcac2.tar.gz chromium_src-874ec6c44739babd348b6bdf9eaa25342c4bcac2.tar.bz2 | |
Clean up device policy definitions.
In particular:
* deprecate obsolete protobuf fields
* remove support for Kiosk App update URLs
* add missing decoding for http_downloads_enabled
BUG=None
Review URL: https://chromiumcodereview.appspot.com/23460030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223041 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/policy')
| -rw-r--r-- | chrome/app/policy/policy_templates.json | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json index bf5d1c0..ffeb660 100644 --- a/chrome/app/policy/policy_templates.json +++ b/chrome/app/policy/policy_templates.json @@ -117,7 +117,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: 242 +# For your editing convenience: highest ID currently used: 243 # # Placeholders: # The following placeholder strings are automatically substituted: @@ -3735,6 +3735,24 @@ The recognized connection type identifiers are "ethernet", "wifi", "wimax", "bluetooth" and "cellular".''', }, { + 'name': 'DeviceUpdateHttpDownloadsEnabled', + 'type': 'main', + 'schema': { + 'type': 'boolean', + }, + 'supported_on': ['chrome_os:29-'], + 'device_only': True, + 'features': { + 'dynamic_refresh': True, + }, + 'example_value': True, + 'id': 243, + 'caption': '''Allow autoupdate downloads via HTTP''', + 'desc': '''Auto-update payloads on <ph name="PRODUCT_OS_NAME">$2<ex>Google Chrome OS</ex></ph> can be downloaded via HTTP instead of HTTPS. This allowes transparent HTTP caching of HTTP downloads. + + If this policy is set to true, <ph name="PRODUCT_OS_NAME">$2<ex>Google Chrome OS</ex></ph> will attempt to download auto-update payloads via HTTP. If the policy is set to false or not set, HTTPS will be used for downloading auto-update payloads.''', + }, + { 'name': 'DeviceLocalAccounts', 'type': 'list', 'schema': { |