diff options
| author | hanxi <hanxi@chromium.org> | 2014-09-30 15:44:20 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-30 22:44:39 +0000 |
| commit | c93416adae7930188e346f03d5764b49934568d3 (patch) | |
| tree | 0a2c5e9ddec58c6005cf05e8dcda95e29d2607e2 /extensions/common/extension_api.cc | |
| parent | a3e007d47ef0ca2d089510a64f4760a0f8bfeadd (diff) | |
| download | chromium_src-c93416adae7930188e346f03d5764b49934568d3.zip chromium_src-c93416adae7930188e346f03d5764b49934568d3.tar.gz chromium_src-c93416adae7930188e346f03d5764b49934568d3.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
Committed: https://crrev.com/4499156f5a5784eee9e0dc021f13b4ea0fd7d0d2
Cr-Commit-Position: refs/heads/master@{#297413}
Review URL: https://codereview.chromium.org/596003002
Cr-Commit-Position: refs/heads/master@{#297532}
Diffstat (limited to 'extensions/common/extension_api.cc')
| -rw-r--r-- | extensions/common/extension_api.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/extensions/common/extension_api.cc b/extensions/common/extension_api.cc index d10084c..8267695 100644 --- a/extensions/common/extension_api.cc +++ b/extensions/common/extension_api.cc @@ -23,6 +23,7 @@ #include "extensions/common/features/simple_feature.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permissions_data.h" +#include "extensions/grit/extensions_resources.h" #include "ui/base/resource/resource_bundle.h" #include "url/gurl.h" @@ -243,6 +244,11 @@ void ExtensionAPI::InitDefaultConfiguration() { ExtensionsClient::Get()->RegisterAPISchemaResources(this); + RegisterSchemaResource("declarativeWebRequest", + IDR_EXTENSION_API_JSON_DECLARATIVE_WEBREQUEST); + RegisterSchemaResource("webViewRequest", + IDR_EXTENSION_API_JSON_WEB_VIEW_REQUEST); + default_configuration_initialized_ = true; } |