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

Unified Diff: chrome/renderer/render_view.cc

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
Index: chrome/renderer/render_view.cc
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 11847de4815f99a5fb013f407fda652866d49345..31161ec945f6ddf5e65da4a96e19a8fa34e27ad1 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -3781,11 +3781,20 @@ void RenderView::didDisplayInsecureContent(WebFrame* frame) {
Send(new ViewHostMsg_DidDisplayInsecureContent(routing_id_));
}
+// 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.
void RenderView::didRunInsecureContent(
WebFrame* frame, const WebSecurityOrigin& origin) {
+ didRunInsecureContent(frame, origin, "");
+}
+
+void RenderView::didRunInsecureContent(
+ WebFrame* frame, const WebSecurityOrigin& origin, const WebString& target) {
Send(new ViewHostMsg_DidRunInsecureContent(
routing_id_,
- origin.toString().utf8()));
+ origin.toString().utf8(),
+ target.utf8()));
}
bool RenderView::allowScript(WebFrame* frame, bool enabled_per_settings) {

Powered by Google App Engine
This is Rietveld 408576698