Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(909)

Unified Diff: chrome/browser/browser_shutdown.cc

Issue 6835022: Broke ARM compile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/first_run/try_chrome_dialog_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_shutdown.cc
===================================================================
--- chrome/browser/browser_shutdown.cc (revision 81411)
+++ chrome/browser/browser_shutdown.cc (working copy)
@@ -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 @@
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 @@
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)
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/first_run/try_chrome_dialog_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698