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

Unified Diff: content/browser/frame_host/render_frame_host_manager.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, 3 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_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 571bf33c2943f76939b8a24702f24bcb557ebb28..e62701a118b77c89d5b9e6309c1fbada3d6e456c 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -207,8 +207,7 @@ RenderFrameHostImpl* RenderFrameHostManager::Navigate(
// Create a pending RenderFrameHost to use for the navigation.
RenderFrameHostImpl* dest_render_frame_host = UpdateStateForNavigate(
dest_url, frame_entry.source_site_instance(), frame_entry.site_instance(),
- entry.GetTransitionType(),
- entry.restore_type() != NavigationEntryImpl::RESTORE_NONE,
+ entry.GetTransitionType(), entry.restore_type() != RestoreType::NONE,
entry.IsViewSourceMode(), entry.transferred_global_request_id(),
entry.bindings(), is_reload);
if (!dest_render_frame_host)
@@ -761,8 +760,7 @@ RenderFrameHostImpl* RenderFrameHostManager::GetFrameHostForNavigation(
request.common_params().url, request.source_site_instance(),
request.dest_site_instance(), candidate_site_instance,
request.common_params().transition,
- request.restore_type() != NavigationEntryImpl::RESTORE_NONE,
- request.is_view_source());
+ request.restore_type() != RestoreType::NONE, request.is_view_source());
// The appropriate RenderFrameHost to commit the navigation.
RenderFrameHostImpl* navigation_rfh = nullptr;
« no previous file with comments | « content/browser/frame_host/navigator_impl.cc ('k') | content/browser/frame_host/render_frame_host_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698