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

Unified Diff: webkit/tools/test_shell/test_webview_delegate.cc

Issue 14330009: Remove WebNode parameter from decidePolicyForNavigation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
« no previous file with comments | « webkit/tools/test_shell/test_webview_delegate.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « 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