content/browser/web_contents/navigation_controller_impl.cc - Issue 19699007: Ensure we don't crash if user navigates back from NTP to Chrome sign-in page before it has fully lo…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 19699007: Ensure we don't crash if user navigates back from NTP to Chrome sign-in page before it has fully lo… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add test coverage for removing a pending entry. Created 7 years, 5 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

« chrome/browser/signin/signin_browsertest.cc ('K') | « content/browser/web_contents/navigation_controller_impl.h ('k') | content/browser/web_contents/navigation_controller_impl_unittest.cc » ('j') | content/public/browser/navigation_controller.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/navigation_controller_impl.cc

diff --git a/content/browser/web_contents/navigation_controller_impl.cc b/content/browser/web_contents/navigation_controller_impl.cc

index c13f3bef8e52beb250d9cdfe400a77aacd1ed103..b05824edfae2fbcaf77298863626b21a8f515ac9 100644

--- a/content/browser/web_contents/navigation_controller_impl.cc

+++ b/content/browser/web_contents/navigation_controller_impl.cc

@@ -600,11 +600,13 @@ void NavigationControllerImpl::GoToOffset(int offset) {

GoToIndex(GetIndexForOffset(offset));

}

-void NavigationControllerImpl::RemoveEntryAtIndex(int index) {

- if (index == last_committed_entry_index_)

- return;

+bool NavigationControllerImpl::RemoveEntryAtIndex(int index) {

+ if (index == last_committed_entry_index_ ||

+ index == pending_entry_index_)

+ return false;

RemoveEntryAtIndexInternal(index);

+ return true;

}

void NavigationControllerImpl::UpdateVirtualURLToURL(