diff options
| author | gwilson@chromium.org <gwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 20:37:21 +0000 |
|---|---|---|
| committer | gwilson@chromium.org <gwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 20:37:21 +0000 |
| commit | cf80dd56cf16b69b63d7064dc79269fbea35394b (patch) | |
| tree | 69aa8a7eaf87be39972730281164616303e836cb | |
| parent | 8ce4ad18f865bb6b2c5d9ae714f9ec69b944d81e (diff) | |
| download | chromium_src-cf80dd56cf16b69b63d7064dc79269fbea35394b.zip chromium_src-cf80dd56cf16b69b63d7064dc79269fbea35394b.tar.gz chromium_src-cf80dd56cf16b69b63d7064dc79269fbea35394b.tar.bz2 | |
Merge 41447 - Modifies the overinstall behavior of setup to launch Chrome itself instead of letting Omaha do it.
BUG=37410
R=cpu
TEST=Install systemlevel chrome, then install userlevel chrome. Systemlevel Chrome should launch (with err message)
Review URL: http://codereview.chromium.org/878002
TBR=cpu@chromium.org
Review URL: http://codereview.chromium.org/855007
git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@41472 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/installer/setup/setup_main.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc index 9df3c8f..566c743 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc @@ -13,6 +13,7 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/path_service.h" +#include "base/process_util.h" #include "base/registry.h" #include "base/scoped_handle_win.h" #include "base/string_util.h" @@ -170,8 +171,9 @@ bool CheckPreInstallConditions(const installer::Version* installed_version, chrome_exe = L"\"" + chrome_exe + L"\" --" + ASCIIToWide(switches::kFirstRun); InstallUtil::WriteInstallerResult(system_install, status, - 0, &chrome_exe); + 0, NULL); LOG(INFO) << "Launching existing system-level chrome instead."; + base::LaunchApp(chrome_exe, false, false, NULL); return false; } } |