diff options
| author | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 16:09:21 +0000 |
|---|---|---|
| committer | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 16:09:21 +0000 |
| commit | 4eabfab2174ac8b8d7d8896de1592e577b50c185 (patch) | |
| tree | fb4b04bc8cb67ef0199db32c0fdac9154a0e97af /chrome/renderer/chrome_render_view_observer.h | |
| parent | 882d74a9480c0838f440f40f26d19a9959d4920d (diff) | |
| download | chromium_src-4eabfab2174ac8b8d7d8896de1592e577b50c185.zip chromium_src-4eabfab2174ac8b8d7d8896de1592e577b50c185.tar.gz chromium_src-4eabfab2174ac8b8d7d8896de1592e577b50c185.tar.bz2 | |
Take script URLs into account when applying script content settings.
Transmit script content settings to the renderer. Use the script URL as the secondary URL
for the content setting rules.
BUG=90840
TEST=ChromeRenderViewTest.ContentSettings(Allow|Block)Scripts
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=109005
Review URL: http://codereview.chromium.org/8409006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109036 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/chrome_render_view_observer.h')
| -rw-r--r-- | chrome/renderer/chrome_render_view_observer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/renderer/chrome_render_view_observer.h b/chrome/renderer/chrome_render_view_observer.h index f0d8e82..c3e5fca 100644 --- a/chrome/renderer/chrome_render_view_observer.h +++ b/chrome/renderer/chrome_render_view_observer.h @@ -90,6 +90,9 @@ class ChromeRenderViewObserver : public content::RenderViewObserver, bool enabled_per_settings) OVERRIDE; virtual bool allowScript(WebKit::WebFrame* frame, bool enabled_per_settings) OVERRIDE; + virtual bool allowScriptFromSource(WebKit::WebFrame* frame, + bool enabled_per_settings, + const WebKit::WebURL& script_url) OVERRIDE; virtual bool allowScriptExtension(WebKit::WebFrame* frame, const WebKit::WebString& extension_name, int extension_group) OVERRIDE; |