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

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 1002953004: Ensure we properly set PageTransition for iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index d38f2b35cce2bd8ccc1dcb9ddbb6823e3d6c0b41..fbb185b2b45be4e63c753b670812cd91b9417806 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -1616,8 +1616,14 @@ void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params,
TRACE_EVENT1("navigation", "RenderFrameHostImpl::OpenURL", "url",
validated_url.possibly_invalid_spec());
+ ui::PageTransition transition = ui::PAGE_TRANSITION_LINK;
+ if (frame_tree_node_->parent()) {
+ transition = params.should_replace_current_entry
Charlie Reis 2015/04/22 20:44:57 Maybe we should be preserving the actual transitio
Nate Chapin 2015/04/22 21:59:23 That doesn't really work, because the NavigationSt
Charlie Reis 2015/04/22 22:04:29 Ok. I'll defer on this, since we should be able t
+ ? ui::PAGE_TRANSITION_AUTO_SUBFRAME
+ : ui::PAGE_TRANSITION_MANUAL_SUBFRAME;
+ }
frame_tree_node_->navigator()->RequestOpenURL(
- this, validated_url, source_site_instance, params.referrer,
+ this, validated_url, source_site_instance, params.referrer, transition,
params.disposition, params.should_replace_current_entry,
params.user_gesture);
}

Powered by Google App Engine
This is Rietveld 408576698