chrome/browser/browser_process_impl.cc - Issue 2866034: Refactor shutdown code to allow win/linux to run after last browser closes.

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

Issue 2866034: Refactor shutdown code to allow win/linux to run after last browser closes. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Uploaded patch that resolves merge issue Created 10 years, 5 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/browser_process_impl.cc

diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc

index bee3eafc20a96476fba3d981bd0e9146e2044bc0..2fac31a160f9b595d2f1c7bd620a8fd89f5b4fbf 100644

--- a/chrome/browser/browser_process_impl.cc

+++ b/chrome/browser/browser_process_impl.cc

@@ -547,7 +547,8 @@ void BrowserProcessImpl::DoInspectorFilesCheck() {

bool BrowserProcessImpl::CanAutorestartForUpdate() const {

// Check if browser is in the background and if it needs to be restarted to

// apply a pending update.

- return BrowserList::IsInPersistentMode() && Upgrade::IsUpdatePendingRestart();

+ return BrowserList::size() == 0 && !BrowserList::WillKeepAlive() &&

+ Upgrade::IsUpdatePendingRestart();

}

// Switches enumerated here will be removed when a background instance of

« no previous file with comments | « chrome/browser/browser_main_mac.mm ('k') | chrome/browser/browser_shutdown.h » ('j') | no next file with comments »