diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-24 20:24:07 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-24 20:24:07 +0000 |
| commit | 6125270cdb5d187d77e1967ecca5b735ba1c2399 (patch) | |
| tree | 2f88c5730e7b68d8671bf70f8345995448a4abbe | |
| parent | 11d309247521ce7773f76a07e9d117f4a63fcbb2 (diff) | |
| download | chromium_src-6125270cdb5d187d77e1967ecca5b735ba1c2399.zip chromium_src-6125270cdb5d187d77e1967ecca5b735ba1c2399.tar.gz chromium_src-6125270cdb5d187d77e1967ecca5b735ba1c2399.tar.bz2 | |
Merge 279175 "Enable enterprise.platformKeys API on stable channel."
> Enable enterprise.platformKeys API on stable channel.
>
> BUG=387622
>
> Review URL: https://codereview.chromium.org/349213003
TBR=pneubeck@chromium.org
Review URL: https://codereview.chromium.org/354703003
git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@279479 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/common/extensions/api/_permission_features.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/common/extensions/api/_permission_features.json b/chrome/common/extensions/api/_permission_features.json index 478e5ac..8c95113 100644 --- a/chrome/common/extensions/api/_permission_features.json +++ b/chrome/common/extensions/api/_permission_features.json @@ -383,7 +383,7 @@ ] }, "enterprise.platformKeys": { - "channel": "dev", + "channel": "stable", "platforms": ["chromeos"], "extension_types": ["extension", "legacy_packaged_app"], "location": "policy" |