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

Unified Diff: content/shell/renderer/test_runner/web_frame_test_proxy.h

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/renderer/render_view_browsertest.cc ('k') | content/shell/renderer/test_runner/web_test_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/renderer/test_runner/web_frame_test_proxy.h
diff --git a/content/shell/renderer/test_runner/web_frame_test_proxy.h b/content/shell/renderer/test_runner/web_frame_test_proxy.h
index 9d355f22f630233c99b97250d1a1938287a958c4..a280199c46eb452711b3e9602e70f43c438f8fd9 100644
--- a/content/shell/renderer/test_runner/web_frame_test_proxy.h
+++ b/content/shell/renderer/test_runner/web_frame_test_proxy.h
@@ -66,9 +66,10 @@ class WebFrameTestProxy : public Base {
Base::loadURLExternally(frame, request, policy, suggested_name);
}
- virtual void didStartProvisionalLoad(blink::WebLocalFrame* frame) {
+ virtual void didStartProvisionalLoad(blink::WebLocalFrame* frame,
+ bool isTransitionNavigation) {
base_proxy_->DidStartProvisionalLoad(frame);
- Base::didStartProvisionalLoad(frame);
+ Base::didStartProvisionalLoad(frame, isTransitionNavigation);
}
virtual void didReceiveServerRedirectForProvisionalLoad(
@@ -244,19 +245,13 @@ class WebFrameTestProxy : public Base {
}
virtual blink::WebNavigationPolicy decidePolicyForNavigation(
- blink::WebLocalFrame* frame,
- blink::WebDataSource::ExtraData* extra_data,
- const blink::WebURLRequest& request,
- blink::WebNavigationType type,
- blink::WebNavigationPolicy default_policy,
- bool is_redirect) {
+ const blink::WebFrameClient::NavigationPolicyInfo& info) {
blink::WebNavigationPolicy policy = base_proxy_->DecidePolicyForNavigation(
- frame, extra_data, request, type, default_policy, is_redirect);
+ info);
if (policy == blink::WebNavigationPolicyIgnore)
return policy;
- return Base::decidePolicyForNavigation(
- frame, extra_data, request, type, default_policy, is_redirect);
+ return Base::decidePolicyForNavigation(info);
}
virtual void willStartUsingPeerConnectionHandler(
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | content/shell/renderer/test_runner/web_test_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698