summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 21:23:59 +0000
committerjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 21:23:59 +0000
commitb7ef8ae5f19caaf3761fc82219aecf9c7359e611 (patch)
treed969e17f9a2fbed4d1bd7951b4f7694578b18b2f
parentbaaa9195f4e9ed411f721bd7dcc804209d0949e8 (diff)
downloadchromium_src-b7ef8ae5f19caaf3761fc82219aecf9c7359e611.zip
chromium_src-b7ef8ae5f19caaf3761fc82219aecf9c7359e611.tar.gz
chromium_src-b7ef8ae5f19caaf3761fc82219aecf9c7359e611.tar.bz2
Merge 260890 "Enable GCM for stable channel"
> Enable GCM for stable channel > > BUG=356807,358434 > TEST=existing tests > R=fgorski@chromium.org, kalman@chromium.org > > Review URL: https://codereview.chromium.org/220333002 TBR=jianli@chromium.org Review URL: https://codereview.chromium.org/220593007 git-svn-id: svn://svn.chromium.org/chrome/branches/1916/src@260943 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/common/extensions/api/_permission_features.json2
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 751b945..6bdd8b5 100644
--- a/chrome/common/extensions/api/_permission_features.json
+++ b/chrome/common/extensions/api/_permission_features.json
@@ -421,7 +421,7 @@
"extension_types": ["extension", "legacy_packaged_app"]
},
"gcm": {
- "channel": "dev",
+ "channel": "stable",
"extension_types": ["extension", "platform_app"]
},
"geolocation": {