summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/render_view.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/renderer/render_view.cc')
-rw-r--r--chrome/renderer/render_view.cc11
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index fe84d68..1633aec 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -3682,11 +3682,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, GURL());
+}
+
+void RenderView::didRunInsecureContent(
+ WebFrame* frame, const WebSecurityOrigin& origin, const WebURL& target) {
Send(new ViewHostMsg_DidRunInsecureContent(
routing_id_,
- origin.toString().utf8()));
+ origin.toString().utf8(),
+ target));
}
bool RenderView::allowScript(WebFrame* frame, bool enabled_per_settings) {