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

Unified Diff: webkit/tools/test_shell/test_webview_delegate.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: webkit/tools/test_shell/test_webview_delegate.cc
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index fccf8e7d78f0bd03f2cd05c8a382449081aef1be..d92be9432a105b2f4435da34ebcc9fcaa5a90e33 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -1099,12 +1099,21 @@ void TestWebViewDelegate::didDisplayInsecureContent(WebFrame* frame) {
printf("didDisplayInsecureContent\n");
}
+// 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 TestWebViewDelegate::didRunInsecureContent(
WebFrame* frame, const WebSecurityOrigin& origin) {
if (shell_->ShouldDumpFrameLoadCallbacks())
printf("didRunInsecureContent\n");
}
+void TestWebViewDelegate::didRunInsecureContent(
+ WebFrame* frame, const WebSecurityOrigin& origin, const WebString& target) {
+ if (shell_->ShouldDumpFrameLoadCallbacks())
+ printf("didRunInsecureContent\n");
+}
+
bool TestWebViewDelegate::allowScript(WebFrame* frame,
bool enabled_per_settings) {
return enabled_per_settings && shell_->allow_scripts();
« chrome/renderer/render_view.h ('K') | « webkit/tools/test_shell/test_webview_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698