summaryrefslogtreecommitdiffstats
path: root/chrome/app/chrome_exe_main_gtk.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-13 17:19:19 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-13 17:19:19 +0000
commit81585672180a76679b1ef028a95b70c822326487 (patch)
treeeedc374e94a2c104f92b356c7a6d188f589189dd /chrome/app/chrome_exe_main_gtk.cc
parentaeb64bfed7785b3702c82f060e1155315c80c425 (diff)
downloadchromium_src-81585672180a76679b1ef028a95b70c822326487.zip
chromium_src-81585672180a76679b1ef028a95b70c822326487.tar.gz
chromium_src-81585672180a76679b1ef028a95b70c822326487.tar.bz2
first-run: Reland refactor of Upgrade class into upgrade_util API.
This fix linux_chromeos build by adding an appropriate #ifdef on upgrade_util_linux.cc. BUG=79203 TEST=None TBR=jhawkins@chromium.org Review URL: http://codereview.chromium.org/6839021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_exe_main_gtk.cc')
-rw-r--r--chrome/app/chrome_exe_main_gtk.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/app/chrome_exe_main_gtk.cc b/chrome/app/chrome_exe_main_gtk.cc
index bf9589d..1e3fa0e 100644
--- a/chrome/app/chrome_exe_main_gtk.cc
+++ b/chrome/app/chrome_exe_main_gtk.cc
@@ -6,7 +6,7 @@
#include "build/build_config.h"
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-#include "chrome/browser/first_run/upgrade.h"
+#include "chrome/browser/first_run/upgrade_util.h"
#endif
// The entry point for all invocations of Chromium, browser and renderer. On
@@ -51,7 +51,7 @@ int main(int argc, const char** argv) {
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
// Launch a new instance if we're shutting down because we detected an
// upgrade in the persistent mode.
- Upgrade::RelaunchChromeBrowserWithNewCommandLineIfNeeded();
+ upgrade_util::RelaunchChromeBrowserWithNewCommandLineIfNeeded();
#endif
return return_code;