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

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

Issue 1114403002: Fix mis-classification of navigations when there is a pending page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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
Index: content/browser/frame_host/navigation_controller_impl.cc
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
index f2850dc7efb03aba911884b695c0ff295c6149c4..c741877a11f2072fcb925bba4cbdea27c77ab0cb 100644
--- a/content/browser/frame_host/navigation_controller_impl.cc
+++ b/content/browser/frame_host/navigation_controller_impl.cc
@@ -1033,12 +1033,9 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
existing_entry != pending_entry_ &&
pending_entry_->GetPageID() == -1 &&
existing_entry == GetLastCommittedEntry()) {
- const std::vector<GURL>& existing_redirect_chain =
- existing_entry->GetRedirectChain();
-
- if (existing_entry->GetURL() == pending_entry_->GetURL() ||
- (existing_redirect_chain.size() &&
- existing_redirect_chain[0] == pending_entry_->GetURL())) {
+ if (params.url == pending_entry_->GetURL() ||
Charlie Reis 2015/05/01 19:40:48 I think we should be comparing params.url to exist
Avi (use Gerrit) 2015/05/01 20:30:57 Yeah, that sounds right. Let me update the patch a
+ (params.redirects.size() &&
+ params.redirects[0] == pending_entry_->GetURL())) {
// In this case, we have a pending entry for a URL but WebCore didn't do a
// new navigation. This happens when you press enter in the URL bar to
// reload. We will create a pending entry, but WebKit will convert it to

Powered by Google App Engine
This is Rietveld 408576698