diff options
| author | grt <grt@chromium.org> | 2015-02-17 12:32:32 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-17 20:33:04 +0000 |
| commit | 035e1a96b311e92529f4f7d4da9dc869db21e73e (patch) | |
| tree | 515099d69efcce5729edbbdba5b2a4852542df97 /chrome/installer | |
| parent | 5424909d2a74b3f2af7fe4a7b2dce4c7b013bdd2 (diff) | |
| download | chromium_src-035e1a96b311e92529f4f7d4da9dc869db21e73e.zip chromium_src-035e1a96b311e92529f4f7d4da9dc869db21e73e.tar.gz chromium_src-035e1a96b311e92529f4f7d4da9dc869db21e73e.tar.bz2 | |
Allow --force-uninstall for SxS Chrome and disallow --self-destruct.
--self-destruct does not make sense for SxS since SxS cannot be
installed at system-level. --force-uninstall is useful for debugging and
testing, so there is no reason not to support it for SxS.
BUG=456602
R=gab@chromium.org
Review URL: https://codereview.chromium.org/928713003
Cr-Commit-Position: refs/heads/master@{#316645}
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/setup/setup_main.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc index ea96967..acc35d7 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc @@ -1635,7 +1635,7 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance, if (InstallUtil::IsChromeSxSProcess()) { if (system_install || prefs.is_multi_install() || - cmd_line.HasSwitch(installer::switches::kForceUninstall) || + cmd_line.HasSwitch(installer::switches::kSelfDestruct) || cmd_line.HasSwitch(installer::switches::kMakeChromeDefault) || cmd_line.HasSwitch(installer::switches::kRegisterChromeBrowser) || cmd_line.HasSwitch(installer::switches::kRemoveChromeRegistration) || |