summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorlazyboy@chromium.org <lazyboy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-12 09:47:11 +0000
committerlazyboy@chromium.org <lazyboy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-12 09:47:11 +0000
commit52de6ae92ded096bcc683a5d77b5f81fb1df0996 (patch)
treedfb054ca34106e59df58f421c39b6aa6a9dee819 /extensions
parent35e996b61ced2778c095d6f5b1cfca3f4ef350ea (diff)
downloadchromium_src-52de6ae92ded096bcc683a5d77b5f81fb1df0996.zip
chromium_src-52de6ae92ded096bcc683a5d77b5f81fb1df0996.tar.gz
chromium_src-52de6ae92ded096bcc683a5d77b5f81fb1df0996.tar.bz2
Fix <webview>.contextMenus requiring chrome.contextMenus permission.
webview.json and webview_custom_bindings.js had reference directly to context_menus.json (chrome.contextMenus). This CL moves the common part under contextMenusInternal and makes webview and chrome.contextMenus use that instead. BUG=140315 Test=<webview> using contextMenus API shouldn't require to specify {"permissions": "contextMenus"}. Review URL: https://codereview.chromium.org/190393002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256494 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
-rw-r--r--extensions/common/extension_api.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/extensions/common/extension_api.cc b/extensions/common/extension_api.cc
index b418734..9bdd1e4 100644
--- a/extensions/common/extension_api.cc
+++ b/extensions/common/extension_api.cc
@@ -260,6 +260,8 @@ void ExtensionAPI::InitDefaultConfiguration() {
IDR_EXTENSION_API_JSON_WEBSTOREPRIVATE);
RegisterSchemaResource("webViewRequest",
IDR_EXTENSION_API_JSON_WEBVIEW_REQUEST);
+ RegisterSchemaResource("contextMenusInternal",
+ IDR_EXTENSION_API_JSON_CONTEXTMENUSINTERNAL);
default_configuration_initialized_ = true;
}