summaryrefslogtreecommitdiffstats
path: root/extensions/extensions_resources.grd
diff options
context:
space:
mode:
authorhanxi <hanxi@chromium.org>2014-09-30 06:20:08 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-30 13:20:20 +0000
commit4499156f5a5784eee9e0dc021f13b4ea0fd7d0d2 (patch)
treeffa5d2f059101da3fb18b858eff479da748eff96 /extensions/extensions_resources.grd
parent8ed264424db75b12441d3cfd5755d5210e0533bd (diff)
downloadchromium_src-4499156f5a5784eee9e0dc021f13b4ea0fd7d0d2.zip
chromium_src-4499156f5a5784eee9e0dc021f13b4ea0fd7d0d2.tar.gz
chromium_src-4499156f5a5784eee9e0dc021f13b4ea0fd7d0d2.tar.bz2
Several things are done in this CL:
- Update _api_features.json and _permissions.json to allow the following features in extensions: - declarativeWebrequest, - events - webRequest - webViewRequest - Move web_view_request_custom_bindings.js and web_view_request.json to extensions. - Remove ExtensionsAPIClient::GetRuleRegistry() since RuleRegisteryService has been moved to extension. - Clean up extensions/extensions.gyp. TBR=sky@chromium.org BUG=352293 Review URL: https://codereview.chromium.org/596003002 Cr-Commit-Position: refs/heads/master@{#297413}
Diffstat (limited to 'extensions/extensions_resources.grd')
-rw-r--r--extensions/extensions_resources.grd1
1 files changed, 1 insertions, 0 deletions
diff --git a/extensions/extensions_resources.grd b/extensions/extensions_resources.grd
index f8b53a9..4799934 100644
--- a/extensions/extensions_resources.grd
+++ b/extensions/extensions_resources.grd
@@ -10,6 +10,7 @@
<includes>
<include name="IDR_EXTENSION_API_FEATURES" file="common\api\_api_features.json" type="BINDATA" />
<include name="IDR_EXTENSION_API_JSON_DECLARATIVE_WEBREQUEST" file="common\api\declarative_web_request.json" type="BINDATA" />
+ <include name="IDR_EXTENSION_API_JSON_WEB_VIEW_REQUEST" file="common\api\web_view_request.json" type="BINDATA" />
<include name="IDR_EXTENSION_MANIFEST_FEATURES" file="common\api\_manifest_features.json" type="BINDATA" />
<include name="IDR_EXTENSION_PERMISSION_FEATURES" file="common\api\_permission_features.json" type="BINDATA" />
</includes>