| Index: content/browser/frame_host/navigator_impl.cc
|
| diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
|
| index b2be362dfb61d9b6904098078d4c62f5f2c1cbc6..f0301c207692c64c03e4ae769243fbad3ea41302 100644
|
| --- a/content/browser/frame_host/navigator_impl.cc
|
| +++ b/content/browser/frame_host/navigator_impl.cc
|
| @@ -21,7 +21,6 @@
|
| #include "content/browser/webui/web_ui_controller_factory_registry.h"
|
| #include "content/browser/webui/web_ui_impl.h"
|
| #include "content/common/frame_messages.h"
|
| -#include "content/common/navigation_params.h"
|
| #include "content/common/site_isolation_policy.h"
|
| #include "content/common/view_messages.h"
|
| #include "content/public/browser/browser_context.h"
|
| @@ -253,7 +252,8 @@ bool NavigatorImpl::NavigateToEntry(
|
| const FrameNavigationEntry& frame_entry,
|
| const NavigationEntryImpl& entry,
|
| NavigationController::ReloadType reload_type,
|
| - bool is_same_document_history_load) {
|
| + bool is_same_document_history_load,
|
| + LoFiState lofi_state) {
|
| TRACE_EVENT0("browser,navigation", "NavigatorImpl::NavigateToEntry");
|
|
|
| GURL dest_url = frame_entry.url();
|
| @@ -343,7 +343,8 @@ bool NavigatorImpl::NavigateToEntry(
|
| controller_->GetPendingEntryIndex() == -1,
|
| controller_->GetIndexOfEntry(&entry),
|
| controller_->GetLastCommittedEntryIndex(),
|
| - controller_->GetEntryCount()));
|
| + controller_->GetEntryCount(),
|
| + lofi_state));
|
| } else {
|
| // No need to navigate again. Just resume the deferred request.
|
| dest_render_frame_host->GetProcess()->ResumeDeferredNavigation(
|
| @@ -378,10 +379,12 @@ bool NavigatorImpl::NavigateToPendingEntry(
|
| FrameTreeNode* frame_tree_node,
|
| const FrameNavigationEntry& frame_entry,
|
| NavigationController::ReloadType reload_type,
|
| - bool is_same_document_history_load) {
|
| + bool is_same_document_history_load,
|
| + LoFiState lofi_state) {
|
| return NavigateToEntry(frame_tree_node, frame_entry,
|
| *controller_->GetPendingEntry(), reload_type,
|
| - is_same_document_history_load);
|
| + is_same_document_history_load,
|
| + lofi_state);
|
| }
|
|
|
| void NavigatorImpl::DidNavigate(
|
|
|