chrome/browser/ui/search/instant_loader.cc - Issue 14161020: InstantExtended: Fixing a crash when the stale timer could fire after InstantController is deleted.

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/ui/search/instant_loader.cc

Issue 14161020: InstantExtended: Fixing a crash when the stale timer could fire after InstantController is deleted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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: chrome/browser/ui/search/instant_loader.cc

diff --git a/chrome/browser/ui/search/instant_loader.cc b/chrome/browser/ui/search/instant_loader.cc

index 29f4b7401be3ed0cfe1803bb886c106c1e21c38c..10f3491adc220ac5e6e5ae53da2f9badfc9083c3 100644

--- a/chrome/browser/ui/search/instant_loader.cc

+++ b/chrome/browser/ui/search/instant_loader.cc

@@ -121,6 +121,7 @@ void InstantLoader::SetContents(scoped_ptr<content::WebContents> new_contents) {

}

scoped_ptr<content::WebContents> InstantLoader::ReleaseContents() {

+ stale_page_timer_.Stop();

contents_->SetDelegate(NULL);

// Undo tab helper work done in SetContents().

« no previous file with comments | « no previous file | no next file » | no next file with comments »