diff options
| author | huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-17 03:24:45 +0000 |
|---|---|---|
| committer | huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-17 03:24:45 +0000 |
| commit | 1bcb9751195e00e3caa8d2ef1f4593da391154fd (patch) | |
| tree | 0005020b7566ad51ede90cbdec87af143a116efe /chrome/installer/setup | |
| parent | 4b92b19e3788372083133825f53c9b35972a8d36 (diff) | |
| download | chromium_src-1bcb9751195e00e3caa8d2ef1f4593da391154fd.zip chromium_src-1bcb9751195e00e3caa8d2ef1f4593da391154fd.tar.gz chromium_src-1bcb9751195e00e3caa8d2ef1f4593da391154fd.tar.bz2 | |
Add google chrome sxs distribution for installer and omaha launcher.
BUG=35574
TEST=setup.exe can install/uninstall Google Chrome as before.
setup.exe --chrome-sxs can install/uninstall Chrome to alternative path.
Both versions of Chrome can co-exist.
Review URL: http://codereview.chromium.org/596069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup')
| -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 145b7ce..d3533d4 100644 --- a/chrome/installer/setup/install.cc +++ b/chrome/installer/setup/install.cc @@ -94,6 +94,11 @@ void AppendUninstallCommandLineFlags(std::wstring* uninstall_cmd_line, uninstall_cmd_line->append(installer_util::switches::kChromeFrame); } + if (InstallUtil::IsChromeSxSProcess()) { + uninstall_cmd_line->append(L" --"); + uninstall_cmd_line->append(installer_util::switches::kChromeSxS); + } + // Propagate the verbose logging switch to uninstalls too. const CommandLine& command_line = *CommandLine::ForCurrentProcess(); if (command_line.HasSwitch(installer_util::switches::kVerboseLogging)) { |