Upstream version 9.38.198.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 d03c779..1615623 100644 (file)
--- a/src/chrome/common/extensions/api/_manifest_features.json
+++ b/src/chrome/common/extensions/api/_manifest_features.json
@@ -46,13 +46,25 @@
     "channel": "trunk",
     "extension_types": ["extension", "legacy_packaged_app"]
   },
-  "bluetooth": {
+  "bluetooth": [{
     // Note: The "bluetooth" manifest permission is used by the
     // chrome.bluetooth, chrome.bluetoothSocket and chrome.bluetoothLowEnergy
     // APIs.
     "channel": "stable",
-    "extension_types": ["platform_app"]
-  },
+    "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
+    ]
+  }],
   "browser_action": {
     "channel": "stable",
     "extension_types": ["extension"]
@@ -212,6 +224,16 @@
     "channel": "stable",
     "extension_types": "all"
   },
+  "launcher_page": {
+    "channel": "stable",
+    "min_manifest_version": 2,
+    "extension_types": ["platform_app"],
+    "whitelist": [
+      "07BD6A765FFC289FF755D7CAB2893A40EC337FEC",  // http://crbug.com/404000
+      "896B85CC7E913E11C34892C1425A093C0701D386",  // http://crbug.com/404000
+      "11A01C82EF355E674E4F9728A801F5C3CB40D83F"   // http://crbug.com/404000
+    ]
+  },
   "manifest_version": {
     "channel": "stable",
     "extension_types": "all"
@@ -274,7 +296,12 @@
       "4B1D0E19C6C43C008C44A8278C8B5BFE15ABEB3C",
       "F7FA7ABC1ECB89BA8EE6656847EFABBF43BB9BCA",
       "1A26E32DE447A17CBE5E9750CDBA78F58539B39C",  // TODO(rockot): Kill these.
-      "E61F841D8210B6A9891E5384CB665FBED31FCD7B"   // http://crbug.com/281715
+      "E61F841D8210B6A9891E5384CB665FBED31FCD7B",  // http://crbug.com/281715
+
+      // TODO(joaodasilva): remove these two once we have the new policy to
+      // grant auto approval by ID. http://crbug.com/399392
+      "A8208CCC87F8261AFAEB6B85D5E8D47372DDEA6B",
+      "A4577D8C2AF4CF26F40CBCA83FFA4251D6F6C8F8"
     ]
   },
   "omnibox": {