diff options
| author | mek <mek@chromium.org> | 2014-09-08 16:55:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-09 00:28:25 +0000 |
| commit | 7e1d745456f66b1d32df236e285a849c8d69db00 (patch) | |
| tree | d0fddd508d27323418619bd5ee039c6f518f15a8 /chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h | |
| parent | 1ce8e56ea17a7ec0af1683f3aa98ef73ea82d63f (diff) | |
| download | chromium_src-7e1d745456f66b1d32df236e285a849c8d69db00.zip chromium_src-7e1d745456f66b1d32df236e285a849c8d69db00.tar.gz chromium_src-7e1d745456f66b1d32df236e285a849c8d69db00.tar.bz2 | |
Respect the clipboardRead and clipboardWrite permissions in content scripts.
Added an extra "effective extension" property to ScriptContext for this to still work correctly in about:blank iframes inside extension pages.
BUG=395376
Review URL: https://codereview.chromium.org/498513002
Cr-Commit-Position: refs/heads/master@{#293818}
Diffstat (limited to 'chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h')
| -rw-r--r-- | chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h b/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h index 89be8f4..0c0799f 100644 --- a/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h +++ b/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h @@ -21,7 +21,9 @@ class ChromeExtensionsDispatcherDelegate const v8::Handle<v8::Context>& v8_context, blink::WebFrame* frame, const extensions::Extension* extension, - extensions::Feature::Context context_type) OVERRIDE; + extensions::Feature::Context context_type, + const extensions::Extension* effective_extension, + extensions::Feature::Context effective_context_type) OVERRIDE; virtual void InitOriginPermissions(const extensions::Extension* extension, bool is_extension_active) OVERRIDE; virtual void RegisterNativeHandlers( |