| 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,
|
|
|