diff options
| author | gwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 18:00:42 +0000 |
|---|---|---|
| committer | gwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 18:00:42 +0000 |
| commit | edce9ad5b2daa7ebba90caaabd1e48e0dd1bc90b (patch) | |
| tree | d5971467b32a226dd77de4e689c212e0be7e744b /chrome/installer | |
| parent | b2a74caaf15e234b5e6c03151d12c28a319a06cb (diff) | |
| download | chromium_src-edce9ad5b2daa7ebba90caaabd1e48e0dd1bc90b.zip chromium_src-edce9ad5b2daa7ebba90caaabd1e48e0dd1bc90b.tar.gz chromium_src-edce9ad5b2daa7ebba90caaabd1e48e0dd1bc90b.tar.bz2 | |
Modifies the over-install behavior of setup to launch Chrome itself instead of letting Omaha do it.
BUG=37410
R=cpu
TEST=Install system-level chrome, then install user-level chrome. System-level Chrome should launch (with err message)
Review URL: http://codereview.chromium.org/878002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -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 96339e0..c4ab6f8 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" @@ -176,8 +177,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; } } |