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

Unified Diff: content/shell/renderer/test_runner/web_test_proxy.cc

Issue 358973005: Navigation transitions: Pass is_transition_navigation flag up to the embedder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Test fix Created 6 years, 5 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 | « content/shell/renderer/test_runner/web_test_proxy.h ('k') | content/test/test_render_frame_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/renderer/test_runner/web_test_proxy.cc
diff --git a/content/shell/renderer/test_runner/web_test_proxy.cc b/content/shell/renderer/test_runner/web_test_proxy.cc
index 989502b0100b59505e44d91b009e805486c0e7c3..3b6cf1b838c359fabf4a5fcee8f5f35bf2c2eec3 100644
--- a/content/shell/renderer/test_runner/web_test_proxy.cc
+++ b/content/shell/renderer/test_runner/web_test_proxy.cc
@@ -1198,20 +1198,15 @@ void WebTestProxyBase::LocationChangeDone(blink::WebFrame* frame) {
}
blink::WebNavigationPolicy WebTestProxyBase::DecidePolicyForNavigation(
- blink::WebLocalFrame* frame,
- blink::WebDataSource::ExtraData* data,
- const blink::WebURLRequest& request,
- blink::WebNavigationType type,
- blink::WebNavigationPolicy default_policy,
- bool is_redirect) {
+ const blink::WebFrameClient::NavigationPolicyInfo& info) {
blink::WebNavigationPolicy result;
if (!test_interfaces_->testRunner()->policyDelegateEnabled())
- return default_policy;
+ return info.defaultPolicy;
delegate_->printMessage(std::string("Policy delegate: attempt to load ") +
- URLDescription(request.url()) +
+ URLDescription(info.urlRequest.url()) +
" with navigation type '" +
- WebNavigationTypeToString(type) + "'\n");
+ WebNavigationTypeToString(info.navigationType) + "'\n");
if (test_interfaces_->testRunner()->policyDelegateIsPermissive())
result = blink::WebNavigationPolicyCurrentTab;
else
« no previous file with comments | « content/shell/renderer/test_runner/web_test_proxy.h ('k') | content/test/test_render_frame_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698