summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_shutdown.cc
diff options
context:
space:
mode:
authorkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-12 22:39:58 +0000
committerkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-12 22:39:58 +0000
commitc4334a4b0cd6b1b11b115251d8859a502a22d6db (patch)
tree082b21a77e42b7f16185ef3031254a6633c62ef1 /chrome/browser/browser_shutdown.cc
parent603c1d0ce8f84241739005df226f5e31494dd3cd (diff)
downloadchromium_src-c4334a4b0cd6b1b11b115251d8859a502a22d6db.zip
chromium_src-c4334a4b0cd6b1b11b115251d8859a502a22d6db.tar.gz
chromium_src-c4334a4b0cd6b1b11b115251d8859a502a22d6db.tar.bz2
* Try to rename chrome exes in shutdown path as well.
BUG=1463346 Review URL: http://codereview.chromium.org/10805 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5313 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_shutdown.cc')
-rw-r--r--chrome/browser/browser_shutdown.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc
index ef38181..e192688 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.cc
@@ -10,6 +10,7 @@
#include "base/string_util.h"
#include "base/time.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/first_run.h"
#include "chrome/browser/jankometer.h"
#include "chrome/browser/metrics_service.h"
#include "chrome/browser/plugin_process_host.h"
@@ -123,6 +124,10 @@ void Shutdown() {
ResourceBundle::CleanupSharedInstance();
+ if (!Upgrade::IsBrowserAlreadyRunning()) {
+ Upgrade::SwapNewChromeExeIfPresent();
+ }
+
if (shutdown_type_ > NOT_VALID && shutdown_num_processes_ > 0) {
// Measure total shutdown time as late in the process as possible
// and then write it to a file to be read at startup.