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 76945f372123d370833fed31e3835d0b574f9eb8..f30b1a8ce3f67f124f10af086c61ba5a1720ead5 100644 |
--- a/webkit/tools/test_shell/test_webview_delegate.cc |
+++ b/webkit/tools/test_shell/test_webview_delegate.cc |
@@ -558,18 +558,13 @@ void TestWebViewDelegate::loadURLExternally( |
WebNavigationPolicy TestWebViewDelegate::decidePolicyForNavigation( |
WebFrame* frame, const WebURLRequest& request, |
- WebNavigationType type, const WebNode& originating_node, |
- WebNavigationPolicy default_policy, bool is_redirect) { |
+ WebNavigationType type, WebNavigationPolicy default_policy, |
+ bool is_redirect) { |
WebNavigationPolicy result; |
if (policy_delegate_enabled_) { |
- printf("Policy delegate: attempt to load %s with navigation type '%s'", |
+ printf("Policy delegate: attempt to load %s with navigation type '%s'\n", |
GetURLDescription(request.url()).c_str(), |
WebNavigationTypeToString(type)); |
- if (!originating_node.isNull()) { |
- printf(" originating from %s", |
- GetNodeDescription(originating_node, 0).c_str()); |
- } |
- printf("\n"); |
if (policy_delegate_is_permissive_) { |
result = WebKit::WebNavigationPolicyCurrentTab; |
} else { |
@@ -581,6 +576,14 @@ WebNavigationPolicy TestWebViewDelegate::decidePolicyForNavigation( |
return result; |
} |
+WebNavigationPolicy TestWebViewDelegate::decidePolicyForNavigation( |
+ WebFrame* frame, const WebURLRequest& request, |
+ WebNavigationType type, const WebNode& originating_node, |
+ WebNavigationPolicy default_policy, bool is_redirect) { |
+ return decidePolicyForNavigation(frame, request, type, |
+ default_policy, is_redirect); |
+} |
+ |
bool TestWebViewDelegate::canHandleRequest( |
WebFrame* frame, const WebURLRequest& request) { |
GURL url = request.url(); |