summaryrefslogtreecommitdiff
path: root/chromium/content/browser/web_contents/navigation_controller_impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/browser/web_contents/navigation_controller_impl.cc')
-rw-r--r--chromium/content/browser/web_contents/navigation_controller_impl.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/chromium/content/browser/web_contents/navigation_controller_impl.cc b/chromium/content/browser/web_contents/navigation_controller_impl.cc
index c3e9140b48f..2c0596d9c83 100644
--- a/chromium/content/browser/web_contents/navigation_controller_impl.cc
+++ b/chromium/content/browser/web_contents/navigation_controller_impl.cc
@@ -1623,12 +1623,15 @@ void NavigationControllerImpl::FinishRestore(int selected_index,
}
void NavigationControllerImpl::DiscardNonCommittedEntriesInternal() {
+ DiscardPendingEntry();
+ DiscardTransientEntry();
+}
+
+void NavigationControllerImpl::DiscardPendingEntry() {
if (pending_entry_index_ == -1)
delete pending_entry_;
pending_entry_ = NULL;
pending_entry_index_ = -1;
-
- DiscardTransientEntry();
}
void NavigationControllerImpl::DiscardTransientEntry() {