Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / chrome / common / extensions / api / _manifest_features.json

diff --git a/src/chrome/common/extensions/api/_manifest_features.json b/src/chrome/common/extensions/api/_manifest_features.json
index 670bed0..1b25eec 100644 (file)
--- a/src/chrome/common/extensions/api/_manifest_features.json
+++ b/src/chrome/common/extensions/api/_manifest_features.json
@@ -80,7 +80,7 @@
     "extension_types": ["extension"]
   },
   "chrome_settings_overrides": [{
-    "channel": "dev",
+    "channel": "stable",
     "extension_types": ["extension"],
     "platforms": ["win"]
   }, {  // TODO(wittman): remove this section for M37.
@@ -108,24 +108,11 @@
     "channel": "stable",
     "extension_types": ["extension", "legacy_packaged_app"]
   },
-  "commands": [
-    {
-      "channel": "dev",
-      "extension_types": ["platform_app"],
-      "min_manifest_version": 2
-    }, {
-      "channel": "stable",
-      "extension_types": ["extension"],
-      "min_manifest_version": 2
-    }
-  ],
-  "commands.global": [
-    {
-      "channel": "dev",
-      "extension_types": ["extension", "platform_app"],
-      "min_manifest_version": 2
-    }
-  ],
+  "commands": {
+    "channel": "stable",
+    "extension_types": ["extension", "platform_app"],
+    "min_manifest_version": 2
+  },
   "content_pack": {
     "channel": "dev",
     "extension_types": ["extension"]
@@ -415,10 +402,24 @@
     "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
     "min_manifest_version": 2
   },
-  "system_indicator": {
-    "channel": "dev",
-    "extension_types": ["extension", "legacy_packaged_app", "platform_app"]
-  },
+  "system_indicator": [
+    {
+      "channel": "dev",
+      "extension_types": ["extension", "legacy_packaged_app", "platform_app"]
+    },
+    {
+      "channel": "stable",
+      "whitelist": [
+        "F29716B08705C9D3C12CDFE3F638BAE709570C31",  // browser_tests
+        "53041A2FA309EECED01FFC751E7399186E860B2C",  // hangouts
+        "312745D9BF916161191143F6490085EEA0434997",  // hangouts beta
+        "A74A4D44C7CFCD8844830E6140C8D763E12DD8F3",  // Hangouts alpha
+        "E7E2461CE072DF036CF9592740196159E2D7C089",  // Hangouts debug
+        "49DA0B9CCEEA299186C6E7226FD66922D57543DC"   // Hangouts dev
+      ],
+      "extension_types": ["extension", "platform_app"]
+    }
+  ],
   "theme": {
     "channel": "stable",
     "extension_types": ["theme"]