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

Unified Diff: webkit/tools/test_shell/test_webview_delegate.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
Index: webkit/tools/test_shell/test_webview_delegate.h
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index b3a601e0235566512237b240aca0eddb5496b820..656acff996c901289ca886eefb1bd5d46b34f370 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -224,9 +224,17 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
virtual void didFailResourceLoad(
WebKit::WebFrame*, unsigned identifier, const WebKit::WebURLError&);
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);
+
virtual bool allowScript(WebKit::WebFrame* frame, bool enabled_per_settings);
virtual void openFileSystem(
WebKit::WebFrame* frame,

Powered by Google App Engine
This is Rietveld 408576698