commit e88ced52cb6cfc584882b726f142b13db97d2f1c
author michaelpg <michaelpg@chromium.org> Wed Jul 13 22:56:08 2016
committer Commit bot <commit-bot@chromium.org> Wed Jul 13 22:58:57 2016
tree 20e95e56cdcc1622069ab0728cb7c5c70944f204
parent 2eb43a6078426caf95b9fd46342e47696bfb4272

Whitelist extension APIs from md-settings in settings

If the MaterialDesignSettings feature is enabled, chrome://settings loads
MD settings, so whitelist extension APIs there too.

The test will involve adding the MaterialDesignSettings feature and
checking for console errors. Looking into the best way to do that.

BUG=627932
R=dbeam@chromium.org

Review-Url: https://codereview.chromium.org/2148043002
Cr-Commit-Position: refs/heads/master@{#405332}

chrome/common/extensions/api/_api_features.json

diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/extensions/api/_api_features.json
index dbabc8a..233a24f 100644
--- a/chrome/common/extensions/api/_api_features.json
+++ b/chrome/common/extensions/api/_api_features.json
@@ -548,7 +548,8 @@
     "channel": "stable",
     "contexts": ["webui"],
     "matches": [
-      "chrome://md-settings/*"
+      "chrome://md-settings/*",
+      "chrome://settings/*"
     ]
   }],
   "instanceID": {
@@ -699,7 +700,8 @@
     "channel": "stable",
     "contexts": ["webui"],
     "matches": [
-      "chrome://md-settings/*"
+      "chrome://md-settings/*",
+      "chrome://settings/*"
     ],
     "platforms": ["chromeos"]
   },