OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/frame_host/navigator_impl.h" | 5 #include "content/browser/frame_host/navigator_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/metrics/histogram_macros.h" | 10 #include "base/metrics/histogram_macros.h" |
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
389 FrameMsg_Navigate_Type::Value navigation_type = GetNavigationType( | 389 FrameMsg_Navigate_Type::Value navigation_type = GetNavigationType( |
390 controller_->GetBrowserContext(), entry, reload_type); | 390 controller_->GetBrowserContext(), entry, reload_type); |
391 dest_render_frame_host->Navigate( | 391 dest_render_frame_host->Navigate( |
392 entry.ConstructCommonNavigationParams( | 392 entry.ConstructCommonNavigationParams( |
393 frame_entry, post_body, dest_url, dest_referrer, navigation_type, | 393 frame_entry, post_body, dest_url, dest_referrer, navigation_type, |
394 lofi_state, navigation_start), | 394 lofi_state, navigation_start), |
395 entry.ConstructStartNavigationParams(), | 395 entry.ConstructStartNavigationParams(), |
396 entry.ConstructRequestNavigationParams( | 396 entry.ConstructRequestNavigationParams( |
397 frame_entry, is_same_document_history_load, | 397 frame_entry, is_same_document_history_load, |
398 is_history_navigation_in_new_child, | 398 is_history_navigation_in_new_child, |
| 399 entry.HasSubtreeHistoryItems(frame_tree_node), |
399 frame_tree_node->has_committed_real_load(), | 400 frame_tree_node->has_committed_real_load(), |
400 controller_->GetPendingEntryIndex() == -1, | 401 controller_->GetPendingEntryIndex() == -1, |
401 controller_->GetIndexOfEntry(&entry), | 402 controller_->GetIndexOfEntry(&entry), |
402 controller_->GetLastCommittedEntryIndex(), | 403 controller_->GetLastCommittedEntryIndex(), |
403 controller_->GetEntryCount())); | 404 controller_->GetEntryCount())); |
404 } else { | 405 } else { |
405 // No need to navigate again. Just resume the deferred request. | 406 // No need to navigate again. Just resume the deferred request. |
406 dest_render_frame_host->GetProcess()->ResumeDeferredNavigation( | 407 dest_render_frame_host->GetProcess()->ResumeDeferredNavigation( |
407 entry.transferred_global_request_id()); | 408 entry.transferred_global_request_id()); |
408 } | 409 } |
(...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1198 if (pending_entry != controller_->GetVisibleEntry() || | 1199 if (pending_entry != controller_->GetVisibleEntry() || |
1199 !should_preserve_entry) { | 1200 !should_preserve_entry) { |
1200 controller_->DiscardPendingEntry(true); | 1201 controller_->DiscardPendingEntry(true); |
1201 | 1202 |
1202 // Also force the UI to refresh. | 1203 // Also force the UI to refresh. |
1203 controller_->delegate()->NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); | 1204 controller_->delegate()->NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); |
1204 } | 1205 } |
1205 } | 1206 } |
1206 | 1207 |
1207 } // namespace content | 1208 } // namespace content |
OLD | NEW |