Chromium Code Reviews| Index: content/renderer/render_frame_impl.cc |
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
| index 7258dbb97d8338997e601ae19c18429750a3aa09..699d50f89257b5d485ba9bc37127ed9bc2231e0e 100644 |
| --- a/content/renderer/render_frame_impl.cc |
| +++ b/content/renderer/render_frame_impl.cc |
| @@ -3682,13 +3682,11 @@ void RenderFrameImpl::SendDidCommitProvisionalLoad(blink::WebFrame* frame) { |
| // Subframe navigation: the type depends on whether this navigation |
| // generated a new session history entry. When they do generate a session |
| // history entry, it means the user initiated the navigation and we should |
| - // mark it as such. This test checks if this is the first time |
| - // SendDidCommitProvisionalLoad has been called since WillNavigateToURL was |
| - // called to initiate the load. |
| - if (render_view_->page_id_ > render_view_->last_page_id_sent_to_browser_) |
|
Charlie Reis
2015/01/14 18:18:40
If this works, that means last_page_id_sent_to_bro
|
| - params.transition = ui::PAGE_TRANSITION_MANUAL_SUBFRAME; |
| - else |
| + // mark it as such. |
| + if (ds->replacesCurrentHistoryItem()) |
|
Charlie Reis
2015/01/14 18:18:40
Interesting. This is true for the first navigatio
Avi (use Gerrit)
2015/01/14 21:23:20
Yes, it is. That's the only way in my rework that
|
| params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME; |
| + else |
| + params.transition = ui::PAGE_TRANSITION_MANUAL_SUBFRAME; |
| DCHECK(!navigation_state->history_list_was_cleared()); |
| params.history_list_was_cleared = false; |