Chromium Code Reviews| Index: chrome/renderer/render_view.h |
| diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h |
| index 59b317cf774b95b36f65f6044f39ac9cfc4feeab..4f1e2f98e4f6f49c6f341ca45222a928145e15f5 100644 |
| --- a/chrome/renderer/render_view.h |
| +++ b/chrome/renderer/render_view.h |
| @@ -615,9 +615,19 @@ class RenderView : public RenderWidget, |
| const WebKit::WebURLRequest& request, |
| const WebKit::WebURLResponse&); |
| virtual void didDisplayInsecureContent(WebKit::WebFrame* frame); |
| + |
| + // We have two didRunInsecureContent's with the same name. That's because |
| + // we're in the process of adding an argument and one of them will be correct. |
| + // Once the WebKit change is in, the first should be removed the the second |
| + // should be tagged with OVERRIDE. |
| + virtual void didRunInsecureContent( |
| + WebKit::WebFrame* frame, |
| + const WebKit::WebSecurityOrigin& origin); |
| virtual void didRunInsecureContent( |
| WebKit::WebFrame* frame, |
| - const WebKit::WebSecurityOrigin& origin) OVERRIDE; |
| + const WebKit::WebSecurityOrigin& origin, |
| + const WebKit::WebString& target); |
|
abarth-chromium
2011/01/13 22:30:14
Not WebURL?
|
| + |
| virtual bool allowScript(WebKit::WebFrame* frame, bool enabled_per_settings); |
| virtual bool allowDatabase(WebKit::WebFrame* frame, |
| const WebKit::WebString& name, |