diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-13 13:50:22 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-13 13:50:22 +0000 |
| commit | d8aebf7cc2dc28f5f6d4ca2ecd2db09570962b57 (patch) | |
| tree | 1216ca60ba27f2aa0f2b5179de05e55c927417fc /chrome/browser/browser_shutdown.cc | |
| parent | 0abd4a7b470aa73b2af427210f01c2276b56bc8c (diff) | |
| download | chromium_src-d8aebf7cc2dc28f5f6d4ca2ecd2db09570962b57.zip chromium_src-d8aebf7cc2dc28f5f6d4ca2ecd2db09570962b57.tar.gz chromium_src-d8aebf7cc2dc28f5f6d4ca2ecd2db09570962b57.tar.bz2 | |
first-run: Refactor Upgrade class into a common upgrade_util API.
BUG=79203
TEST=None
R=jhawkins@chromium.org
Review URL: http://codereview.chromium.org/6840003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81409 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 6c6d4fd..f5b5906 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.h" +#include "chrome/browser/first_run/upgrade_util.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::IsBrowserAlreadyRunning() && + if (!upgrade_util::IsBrowserAlreadyRunning() && shutdown_type_ != browser_shutdown::END_SESSION) { - Upgrade::SwapNewChromeExeIfPresent(); + upgrade_util::SwapNewChromeExeIfPresent(); } #endif @@ -225,7 +225,7 @@ void Shutdown() { new_cl->AppendSwitch(switches::kRestoreLastSession); #if defined(OS_WIN) || defined(OS_LINUX) - Upgrade::RelaunchChromeBrowser(*new_cl.get()); + upgrade_util::RelaunchChromeBrowser(*new_cl.get()); #endif // defined(OS_WIN) || defined(OS_LINUX) #if defined(OS_MACOSX) |