content/browser/frame_host/navigator_impl.cc - Issue 2225343002: Navigation: move RestoreType and ReloadType into a separate file

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

Issue 2225343002: Navigation: move RestoreType and ReloadType into a separate file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase+ Created 4 years, 4 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

« content/browser/frame_host/navigation_controller_impl.cc ('K') | « content/browser/frame_host/navigator_impl.h ('k') | content/browser/frame_host/render_frame_host_manager.cc » ('j') | content/public/browser/navigation_types.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 77f566246bba6935f84640148424c08119634c4d..ea054fcad8ccd87db7b1cb918ebc5647540b305e 100644

--- a/content/browser/frame_host/navigator_impl.cc

+++ b/content/browser/frame_host/navigator_impl.cc

@@ -51,26 +51,26 @@ namespace content {

namespace {

FrameMsg_Navigate_Type::Value GetNavigationType(

- BrowserContext* browser_context, const NavigationEntryImpl& entry,

- NavigationController::ReloadType reload_type) {

+ BrowserContext* browser_context,

+ const NavigationEntryImpl& entry,

+ ReloadType reload_type) {

switch (reload_type) {

- case NavigationController::RELOAD:

+ case ReloadType::NORMAL:

return FrameMsg_Navigate_Type::RELOAD;

- case NavigationController::RELOAD_MAIN_RESOURCE:

+ case ReloadType::MAIN_RESOURCE:

return FrameMsg_Navigate_Type::RELOAD_MAIN_RESOURCE;

- case NavigationController::RELOAD_BYPASSING_CACHE:

- case NavigationController::RELOAD_DISABLE_LOFI_MODE:

+ case ReloadType::BYPASSING_CACHE:

+ case ReloadType::DISABLE_LOFI_MODE:

return FrameMsg_Navigate_Type::RELOAD_BYPASSING_CACHE;

- case NavigationController::RELOAD_ORIGINAL_REQUEST_URL:

+ case ReloadType::ORIGINAL_REQUEST_URL:

return FrameMsg_Navigate_Type::RELOAD_ORIGINAL_REQUEST_URL;

- case NavigationController::NO_RELOAD:

+ case ReloadType::NONE:

break; // Fall through to rest of function.

}

// |RenderViewImpl::PopulateStateFromPendingNavigationParams| differentiates

// between |RESTORE_WITH_POST| and |RESTORE|.

- if (entry.restore_type() ==

- NavigationEntryImpl::RESTORE_LAST_SESSION_EXITED_CLEANLY) {

+ if (entry.restore_type() == RestoreType::LAST_SESSION_EXITED_CLEANLY) {

if (entry.GetHasPostData())

return FrameMsg_Navigate_Type::RESTORE_WITH_POST;

return FrameMsg_Navigate_Type::RESTORE;

@@ -84,12 +84,11 @@ FrameMsg_Navigate_Type::Value GetNavigationType(

struct NavigatorImpl::NavigationMetricsData {

NavigationMetricsData(base::TimeTicks start_time,

GURL url,

- NavigationEntryImpl::RestoreType restore_type)

+ RestoreType restore_type)

: start_time_(start_time), url_(url) {

is_restoring_from_last_session_ =

- (restore_type ==

- NavigationEntryImpl::RESTORE_LAST_SESSION_EXITED_CLEANLY ||

- restore_type == NavigationEntryImpl::RESTORE_LAST_SESSION_CRASHED);

+ (restore_type == RestoreType::LAST_SESSION_EXITED_CLEANLY ||

+ restore_type == RestoreType::LAST_SESSION_CRASHED);

}

base::TimeTicks start_time_;

@@ -272,7 +271,7 @@ bool NavigatorImpl::NavigateToEntry(

FrameTreeNode* frame_tree_node,

const FrameNavigationEntry& frame_entry,

const NavigationEntryImpl& entry,

- NavigationController::ReloadType reload_type,

+ ReloadType reload_type,

bool is_same_document_history_load,

bool is_history_navigation_in_new_child,

bool is_pending_entry,

@@ -281,8 +280,7 @@ bool NavigatorImpl::NavigateToEntry(

GURL dest_url = frame_entry.url();

Referrer dest_referrer = frame_entry.referrer();

- if (reload_type ==

- NavigationController::ReloadType::RELOAD_ORIGINAL_REQUEST_URL &&

+ if (reload_type == ReloadType::ORIGINAL_REQUEST_URL &&

entry.GetOriginalRequestURL().is_valid() && !entry.GetHasPostData()) {

// We may have been redirected when navigating to the current URL.

// Use the URL the user originally intended to visit, if it's valid and if a

@@ -324,8 +322,7 @@ bool NavigatorImpl::NavigateToEntry(

->root()

->current_frame_host()

->last_navigation_lofi_state();

- } else if (reload_type ==

- NavigationController::ReloadType::RELOAD_DISABLE_LOFI_MODE) {

+ } else if (reload_type == ReloadType::DISABLE_LOFI_MODE) {

// Disable LoFi when asked for it explicitly.

lofi_state = LOFI_OFF;

}

@@ -357,8 +354,7 @@ bool NavigatorImpl::NavigateToEntry(

} else {

RenderFrameHostImpl* dest_render_frame_host =

frame_tree_node->render_manager()->Navigate(

- dest_url, frame_entry, entry,

- reload_type != NavigationController::NO_RELOAD);

+ dest_url, frame_entry, entry, reload_type != ReloadType::NONE);

if (!dest_render_frame_host)

return false; // Unable to create the desired RenderFrameHost.

@@ -442,7 +438,7 @@ bool NavigatorImpl::NavigateToEntry(

bool NavigatorImpl::NavigateToPendingEntry(

FrameTreeNode* frame_tree_node,

const FrameNavigationEntry& frame_entry,

- NavigationController::ReloadType reload_type,

+ ReloadType reload_type,

bool is_same_document_history_load) {

return NavigateToEntry(frame_tree_node, frame_entry,

*controller_->GetPendingEntry(), reload_type,

@@ -466,8 +462,7 @@ bool NavigatorImpl::NavigateNewChildFrame(

return false;

return NavigateToEntry(render_frame_host->frame_tree_node(), *frame_entry,

- *entry, NavigationControllerImpl::NO_RELOAD, false,

- true, false, nullptr);

+ *entry, ReloadType::NONE, false, true, false, nullptr);

}

void NavigatorImpl::DidNavigate(

@@ -597,7 +592,7 @@ void NavigatorImpl::DidNavigate(

// Send notification about committed provisional loads. This notification is

// different from the NAV_ENTRY_COMMITTED notification which doesn't include

// the actual URL navigated to and isn't sent for AUTO_SUBFRAME navigations.

- if (details.type != NAVIGATION_TYPE_NAV_IGNORE && delegate_) {

+ if (details.type != NavigationType::NAV_IGNORE && delegate_) {

DCHECK_EQ(!render_frame_host->GetParent(),

did_navigate ? details.is_main_frame : false);

ui::PageTransition transition_type = params.transition;

@@ -853,9 +848,8 @@ void NavigatorImpl::RequestTransferURL(

static_cast<SiteInstanceImpl*>(source_site_instance), dest_url,

referrer_to_use, method, -1);

}

- NavigateToEntry(node, *frame_entry, *entry.get(),

- NavigationController::NO_RELOAD, false, false, false,

- post_body);

+ NavigateToEntry(node, *frame_entry, *entry.get(), ReloadType::NONE, false,

+ false, false, post_body);

}

// PlzNavigate

@@ -1003,17 +997,16 @@ void NavigatorImpl::LogBeforeUnloadTime(

}

// PlzNavigate

-void NavigatorImpl::RequestNavigation(

- FrameTreeNode* frame_tree_node,

- const GURL& dest_url,

- const Referrer& dest_referrer,

- const FrameNavigationEntry& frame_entry,

- const NavigationEntryImpl& entry,

- NavigationController::ReloadType reload_type,

- LoFiState lofi_state,

- bool is_same_document_history_load,

- bool is_history_navigation_in_new_child,

- base::TimeTicks navigation_start) {

+void NavigatorImpl::RequestNavigation(FrameTreeNode* frame_tree_node,

+ const GURL& dest_url,

+ const Referrer& dest_referrer,

+ const FrameNavigationEntry& frame_entry,

+ const NavigationEntryImpl& entry,

+ ReloadType reload_type,

+ LoFiState lofi_state,

+ bool is_same_document_history_load,

+ bool is_history_navigation_in_new_child,

+ base::TimeTicks navigation_start) {

CHECK(IsBrowserSideNavigationEnabled());

DCHECK(frame_tree_node);

@@ -1048,7 +1041,7 @@ void NavigatorImpl::RequestNavigation(

navigation_request->common_params().url)) {

navigation_request->SetWaitingForRendererResponse();

frame_tree_node->current_frame_host()->DispatchBeforeUnload(

- true, reload_type != NavigationController::NO_RELOAD);

+ true, reload_type != ReloadType::NONE);

} else {

navigation_request->BeginNavigation();

}