chrome/browser/ui/browser.cc - Issue 10538095: Merge 141554 - Avoid crash in trying to access profile while shutting down.

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/browser.cc

Issue 10538095: Merge 141554 - Avoid crash in trying to access profile while shutting down. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1132/src/

Patch Set: Created 8 years, 6 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/browser.cc

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

--- chrome/browser/ui/browser.cc (revision 141560)

+++ chrome/browser/ui/browser.cc (working copy)

@@ -4235,7 +4235,8 @@

} else if (pref_name == prefs::kInstantEnabled ||

pref_name == prefs::kMetricsReportingEnabled ||

pref_name == prefs::kSearchSuggestEnabled) {

- if (!InstantController::IsEnabled(profile())) {

+ if (browser_shutdown::ShuttingDownWithoutClosingBrowsers() ||

+ !InstantController::IsEnabled(profile())) {

if (instant()) {

instant()->DestroyPreviewContents();

instant_.reset();

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