content/browser/tab_contents/navigation_controller.cc - Issue 7491096: Fix regression with back-button not working on prerendered and instant pages.

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/tab_contents/navigation_controller.cc

Issue 7491096: Fix regression with back-button not working on prerendered and instant pages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: A few fixes for multiple history entries at swap in Created 9 years, 4 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 | « chrome/test/data/prerender/prerender_page_with_link.html ('k') | content/browser/tab_contents/tab_contents.h » ('j') | content/renderer/render_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/tab_contents/navigation_controller.cc

diff --git a/content/browser/tab_contents/navigation_controller.cc b/content/browser/tab_contents/navigation_controller.cc

index e29ecc31ded29d91e7b56219710a56d94a821cfe..0144fef9b691ea047279e75249cd6688102e25f0 100644

--- a/content/browser/tab_contents/navigation_controller.cc

+++ b/content/browser/tab_contents/navigation_controller.cc

@@ -931,6 +931,9 @@ void NavigationController::CopyStateFromAndPrune(NavigationController* source,

if (last_committed_entry_index_ != -1)

last_committed_entry_index_--;

}

+ // Update the history in the RenderView.

+ tab_contents_->SetHistoryLengthAndClear(max_source_index);

}

void NavigationController::PruneAllButActive() {

« no previous file with comments | « chrome/test/data/prerender/prerender_page_with_link.html ('k') | content/browser/tab_contents/tab_contents.h » ('j') | content/renderer/render_view.cc » ('J')