diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 01:21:48 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 01:21:48 +0000 |
| commit | 41fe40d3b37f05eca4f67f7b38ae66aa33689e0a (patch) | |
| tree | 5fab5fc9ec4345f48f3c86533e9d1a4e3e3a82ec /chrome/browser/browser_shutdown.cc | |
| parent | 9c49ff0c7cf23ef7cfb387da70764a047af8f642 (diff) | |
| download | chromium_src-41fe40d3b37f05eca4f67f7b38ae66aa33689e0a.zip chromium_src-41fe40d3b37f05eca4f67f7b38ae66aa33689e0a.tar.gz chromium_src-41fe40d3b37f05eca4f67f7b38ae66aa33689e0a.tar.bz2 | |
Do not try to swap chrome.exe if machine is shutting down.
BUG=18063
TEST=Installer an update while Chrome is running. Log out of machine without closing Chrome first and make sure sure Chrome gets updated cleanly whenever it is launched next.
Review URL: http://codereview.chromium.org/553079
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_shutdown.cc')
| -rw-r--r-- | chrome/browser/browser_shutdown.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc index 3062dd7..5b583b2 100644 --- a/chrome/browser/browser_shutdown.cc +++ b/chrome/browser/browser_shutdown.cc @@ -148,7 +148,8 @@ void Shutdown() { ResourceBundle::CleanupSharedInstance(); #if defined(OS_WIN) - if (!Upgrade::IsBrowserAlreadyRunning()) { + if (!Upgrade::IsBrowserAlreadyRunning() && + shutdown_type_ != browser_shutdown::END_SESSION) { Upgrade::SwapNewChromeExeIfPresent(); } |