Update To 11.40.268.0

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

diff --git a/src/extensions/common/api/_manifest_features.json b/src/extensions/common/api/_manifest_features.json
index 10cd833..3d8ebba 100644 (file)
--- a/src/extensions/common/api/_manifest_features.json
+++ b/src/extensions/common/api/_manifest_features.json
@@ -16,6 +16,10 @@
 // hashes back to ids.
 
 {
+  "app": {
+    "channel": "stable",
+    "extension_types": ["legacy_packaged_app", "hosted_app", "platform_app"]
+  },
   // The default platform app CSP can only be overridden by whitelisted apps.
   // This is a separate key from the top-level content_security_policy one since
   // we can't combine type restrictions with whitelisted ID restrictions. If
@@ -59,6 +63,29 @@
     ],
     "max_manifest_version": 1
   },
+  "bluetooth": [{
+    // Note: The "bluetooth" manifest permission is used by the
+    // chrome.bluetooth, chrome.bluetoothSocket and chrome.bluetoothLowEnergy
+    // APIs.
+    "channel": "stable",
+    "extension_types": ["platform_app"],
+    "platforms": ["chromeos", "win", "mac"]
+  }, {
+    "channel": "stable",
+    "extension_types": ["platform_app"],
+    "platforms": ["linux"],
+    "whitelist": [
+      "9E287A8257E58EFB13E89C86A4B75A3AC4B058D8",  // unit_tests browser_tests
+      "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80",  // http://crbug.com/396117
+      "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE",  // http://crbug.com/396117
+      "E703483CEF33DEC18B4B6DD84B5C776FB9182BDB",  // http://crbug.com/396117
+      "307E96539209F95A1A8740C713E6998A73657D96",  // http://crbug.com/396117
+      "4F25792AF1AA7483936DE29C07806F203C7170A0",  // http://crbug.com/407693
+      "BD8781D757D830FC2E85470A1B6E8A718B7EE0D9",  // http://crbug.com/407693
+      "4AC2B6C63C6480D150DFDA13E4A5956EB1D0DDBB",  // http://crbug.com/407693
+      "81986D4F846CEDDDB962643FA501D1780DD441BB"   // http://crbug.com/407693
+    ]
+  }],
   "content_security_policy": {
     "channel": "stable",
     // Platform apps have a restricted content security policy that cannot be
@@ -105,6 +132,10 @@
       "location": "component"
     }
   ],
+  "key": {
+    "channel": "stable",
+    "extension_types": "all"
+  },
   "kiosk_enabled": {
     "channel": "stable",
     "extension_types": [
@@ -141,6 +172,37 @@
     "channel": "stable",
     "extension_types": "all"
   },
+  "oauth2": {
+    "channel": "stable",
+    "extension_types": [
+      "extension", "legacy_packaged_app", "platform_app"
+    ]
+  },
+  "oauth2.auto_approve": {
+    "channel": "stable",
+    "extension_types": [
+      "extension", "platform_app"
+    ],
+    "whitelist": [
+      "mdbihdcgjmagbcapkhhkjbbdlkflmbfo",  // unit_tests
+      "pafkbggdmjlpgkdkcbjmhmfcdpncadgh",  // Google Now
+      "nmmhkkegccagdldgiimedpiccmgmieda",  // In-app payments support app.
+      "4B1D0E19C6C43C008C44A8278C8B5BFE15ABEB3C",
+      "F7FA7ABC1ECB89BA8EE6656847EFABBF43BB9BCA",
+      "1A26E32DE447A17CBE5E9750CDBA78F58539B39C",  // TODO(rockot): Kill these.
+      "E61F841D8210B6A9891E5384CB665FBED31FCD7B",  // http://crbug.com/281715
+
+      "07BD6A765FFC289FF755D7CAB2893A40EC337FEC",  // http://crbug.com/430730
+      "896B85CC7E913E11C34892C1425A093C0701D386",  // http://crbug.com/430730
+      "11A01C82EF355E674E4F9728A801F5C3CB40D83F",  // http://crbug.com/430730
+      "F410C88469990EE7947450311D24B8AF2ADB2595",  // http://crbug.com/430730
+
+      // TODO(joaodasilva): remove these two once we have the new policy to
+      // grant auto approval by ID. http://crbug.com/399392
+      "A8208CCC87F8261AFAEB6B85D5E8D47372DDEA6B",
+      "A4577D8C2AF4CF26F40CBCA83FFA4251D6F6C8F8"
+    ]
+  },
   "offline_enabled": {
     "channel": "stable",
     "extension_types": [
@@ -148,7 +210,7 @@
     ]
   },
   "options_ui": {
-    "channel": "trunk",
+    "channel": "stable",
     "extension_types": ["extension", "legacy_packaged_app"]
   },
   "sandbox": {