chrome/browser/tab_contents/navigation_controller.cc - Issue 5581010: Merge 68646 - Makes instant run before unload listeners....

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

Issue 5581010: Merge 68646 - Makes instant run before unload listeners.... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/597/src/

Patch Set: Created 10 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/tab_contents/navigation_controller.cc

===================================================================

--- chrome/browser/tab_contents/navigation_controller.cc (revision 68655)

+++ chrome/browser/tab_contents/navigation_controller.cc (working copy)

@@ -980,8 +980,10 @@

// Take over the session id from source.

session_id_ = source->session_id_;

- // Reset source's session id as we're taking it over.

- source->session_id_.clear();

+ // Reset source's session id as we're taking it over. We give it a new id in

+ // case source is added later on, which can happen with instant enabled if the

+ // tab has a before unload handler.

+ source->session_id_ = SessionID();

}

void NavigationController::PruneAllButActive() {