diff options
| author | prasadt@chromium.org <prasadt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-24 16:52:53 +0000 |
|---|---|---|
| committer | prasadt@chromium.org <prasadt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-24 16:52:53 +0000 |
| commit | c10fa39515fee77141ba42b07056fecf2f07fd95 (patch) | |
| tree | 05f44d9a969634b5681ebd6240ea17b3f764d447 /chrome/browser/browser_process_impl.cc | |
| parent | f143707210de1a934c46a62c79ef0d8223b4a863 (diff) | |
| download | chromium_src-c10fa39515fee77141ba42b07056fecf2f07fd95.zip chromium_src-c10fa39515fee77141ba42b07056fecf2f07fd95.tar.gz chromium_src-c10fa39515fee77141ba42b07056fecf2f07fd95.tar.bz2 | |
Autorestart on update should happen when (among other things), the browser is in
KeepAlive mode. The condition to check that in CanAutorestartForUpdate() is
reversed.
BUG=none
TEST=On Linux - Change BrowserProcessImpl::StartAutoupdateTimer() function to
change the timer from 6hrs to 30 seconds. Build and run chrome with
--no-startup-window and --keep-alive-for-test flags. Run "touch" on browser
exe to fake an update. Wait for 30 seconds and verify that the browser shuts
down and restarts.
Review URL: http://codereview.chromium.org/3206003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57197 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 2ca9f62..8dcdbb6 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -717,7 +717,7 @@ 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::size() == 0 && !BrowserList::WillKeepAlive() && + return BrowserList::size() == 0 && BrowserList::WillKeepAlive() && Upgrade::IsUpdatePendingRestart(); } |