summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorvabr@chromium.org <vabr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-21 11:40:52 +0000
committervabr@chromium.org <vabr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-21 11:40:52 +0000
commitd726716fd30e6153dc79bfd8dd2d584bf5aeb592 (patch)
tree299ed701c6f85b73623f330e762a3c2379eca03a /chrome/app
parent1b2ad303f87487cbdc6f1d73c403a1eddc9ba548 (diff)
downloadchromium_src-d726716fd30e6153dc79bfd8dd2d584bf5aeb592.zip
chromium_src-d726716fd30e6153dc79bfd8dd2d584bf5aeb592.tar.gz
chromium_src-d726716fd30e6153dc79bfd8dd2d584bf5aeb592.tar.bz2
Add permission string for declarativeWebRequest
[Glossary: DWR = Declarative Web Request] The interesting part here is making this work with host permissions so that if an extension asks for all hosts and DWR, only the warning for all hosts appears. (This is because the warning for DWR is weaker than that for all hosts.) I verified the following in the browser, and added unit tests for checking it: 1) Installing an extension with both all hosts and DWR only displays the all-hosts warning, whereas installing only DWR displays the DWR warning. 2) Installing an extension with all hosts permissions, then updating it to a newer version also requiring DWR does not disable the extension. On the other hand, if an extension has all hosts permission, and specifies DWR as optional, and later asks for DWR, the DWR string is shown. With some difficulty this could probably also be fixed. I'm not sure what is the intended behaviour here, though. BUG=267639 Review URL: https://chromiumcodereview.appspot.com/23093007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218703 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index a0c3e20..f7a3caa 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4201,6 +4201,9 @@ Make sure you do not expose any sensitive information.
<message name="IDS_EXTENSION_PROMPT_WARNING_DESKTOP_CAPTURE" desc="Permission string for Desktop Capture API.">
Capture content of your screen
</message>
+ <message name="IDS_EXTENSION_PROMPT_WARNING_DECLARATIVE_WEB_REQUEST" desc="Permission string for Declarative Web Request API.">
+ Block parts of web pages
+ </message>
<!-- Extension/App error messages -->
<message name="IDS_EXTENSION_CANT_GET_ABSOLUTE_PATH" desc="Warning displayed in pack dialog when the absolute path to the extension directory can not be found.">