diff options
| author | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-13 14:15:33 +0000 |
|---|---|---|
| committer | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-13 14:15:33 +0000 |
| commit | 7688e3b9aa44d3b7f455cd8a8ec8c1b9ee16a4a0 (patch) | |
| tree | 6875549a37cb19d59e61a7485739c3e2ac2910ba /chrome/browser/browser_shutdown.cc | |
| parent | d55cedb42908a385195ea8502ed252893129a951 (diff) | |
| download | chromium_src-7688e3b9aa44d3b7f455cd8a8ec8c1b9ee16a4a0.zip chromium_src-7688e3b9aa44d3b7f455cd8a8ec8c1b9ee16a4a0.tar.gz chromium_src-7688e3b9aa44d3b7f455cd8a8ec8c1b9ee16a4a0.tar.bz2 | |
Broke ARM compile.
Revert 81409 - first-run: Refactor Upgrade class into a common upgrade_util API.BUG=79203TEST=NoneR=jhawkins@chromium.orgReview URL: http://codereview.chromium.org/6840003
TBR=tfarina@chromium.org
Review URL: http://codereview.chromium.org/6835022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81412 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_shutdown.cc')
| -rw-r--r-- | chrome/browser/browser_shutdown.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc index f5b5906..6c6d4fd 100644 --- a/chrome/browser/browser_shutdown.cc +++ b/chrome/browser/browser_shutdown.cc @@ -22,7 +22,7 @@ #include "build/build_config.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/first_run/upgrade_util.h" +#include "chrome/browser/first_run/upgrade.h" #include "chrome/browser/jankometer.h" #include "chrome/browser/metrics/metrics_service.h" #include "chrome/browser/prefs/pref_service.h" @@ -189,9 +189,9 @@ void Shutdown() { ResourceBundle::CleanupSharedInstance(); #if defined(OS_WIN) - if (!upgrade_util::IsBrowserAlreadyRunning() && + if (!Upgrade::IsBrowserAlreadyRunning() && shutdown_type_ != browser_shutdown::END_SESSION) { - upgrade_util::SwapNewChromeExeIfPresent(); + Upgrade::SwapNewChromeExeIfPresent(); } #endif @@ -225,7 +225,7 @@ void Shutdown() { new_cl->AppendSwitch(switches::kRestoreLastSession); #if defined(OS_WIN) || defined(OS_LINUX) - upgrade_util::RelaunchChromeBrowser(*new_cl.get()); + Upgrade::RelaunchChromeBrowser(*new_cl.get()); #endif // defined(OS_WIN) || defined(OS_LINUX) #if defined(OS_MACOSX) |