diff options
| author | huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-03 04:03:48 +0000 |
|---|---|---|
| committer | huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-03 04:03:48 +0000 |
| commit | fad85577603e114cd60fe523138f9113d65a4dd5 (patch) | |
| tree | 2866b8439b5878f1dfbc09e4f5e9eb8b603f6fea /chrome/installer | |
| parent | 7170ce22e5ec717137bb2e7f10940840209db2b7 (diff) | |
| download | chromium_src-fad85577603e114cd60fe523138f9113d65a4dd5.zip chromium_src-fad85577603e114cd60fe523138f9113d65a4dd5.tar.gz chromium_src-fad85577603e114cd60fe523138f9113d65a4dd5.tar.bz2 | |
Fix in use update of SxS channel.
BUG=35574
TEST="setup.exe --chrome-sxs" while Chrome SxS is running.
Review URL: http://codereview.chromium.org/661373
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40488 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/setup/install.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc index 1c8c903..eec0ed3 100644 --- a/chrome/installer/setup/install.cc +++ b/chrome/installer/setup/install.cc @@ -346,6 +346,11 @@ bool DoPostInstallTasks(HKEY reg_root, rename_cmd += installer_util::switches::kChromeFrame; } + if (InstallUtil::IsChromeSxSProcess()) { + rename_cmd += L" --"; + rename_cmd += installer_util::switches::kChromeSxS; + } + inuse_list->AddSetRegValueWorkItem(reg_root, version_key, google_update::kRegRenameCmdField, |