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

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

Issue 101573003: Add the navigation redirect-chain to Sync sessions proto for offline analysis. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Brett's comment on patch set 46, and rebase. Created 6 years, 8 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
« no previous file with comments | « content/browser/frame_host/navigation_entry_impl.cc ('k') | content/public/browser/navigation_entry.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 7be5f8c967940cc8bd780e2ab9f9313599f045c9..14b2fc1dd6fc74895b8e61a1b11cacad4bfa4d5e 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -108,7 +108,13 @@ void MakeNavigateParams(const NavigationEntryImpl& entry,
entry.GetBrowserInitiatedPostData()->size());
}
- params->redirects = entry.redirect_chain();
+ // Set the redirect chain to the navigation's redirects, unless we are
+ // returning to a completed navigation (whose previous redirects don't apply).
+ if (PageTransitionIsNewNavigation(params->transition)) {
+ params->redirects = entry.GetRedirectChain();
+ } else {
+ params->redirects.clear();
+ }
params->can_load_local_resources = entry.GetCanLoadLocalResources();
params->frame_to_navigate = entry.GetFrameToNavigate();
@@ -169,7 +175,7 @@ void NavigatorImpl::DidStartProvisionalLoad(
entry->set_transferred_global_request_id(
pending_entry->transferred_global_request_id());
entry->set_should_replace_entry(pending_entry->should_replace_entry());
- entry->set_redirect_chain(pending_entry->redirect_chain());
+ entry->SetRedirectChain(pending_entry->GetRedirectChain());
}
controller_->SetPendingEntry(entry);
if (delegate_)
« no previous file with comments | « content/browser/frame_host/navigation_entry_impl.cc ('k') | content/public/browser/navigation_entry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698