Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2532)

Unified Diff: chrome/renderer/render_view.h

Issue 6272003: Add another didRunInsecureContent method. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/render_messages_internal.h ('k') | chrome/renderer/render_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « chrome/common/render_messages_internal.h ('k') | chrome/renderer/render_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698