diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 21:02:23 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 21:02:23 +0000 |
| commit | 9c7675c2eaede3572e28e5f1ae964836fcaf18ae (patch) | |
| tree | 5655eb014d613e22c39d8c380a919a6944770bb2 /chrome | |
| parent | 00adfab06a6e468e3d884d98e214128fe0a0db1d (diff) | |
| download | chromium_src-9c7675c2eaede3572e28e5f1ae964836fcaf18ae.zip chromium_src-9c7675c2eaede3572e28e5f1ae964836fcaf18ae.tar.gz chromium_src-9c7675c2eaede3572e28e5f1ae964836fcaf18ae.tar.bz2 | |
Stop uninstalling if user cancels Chrome uninstall.
BUG=69484
TEST=Follow steps in bug. Upon cancel, Chrome and Chrome Frame ready-mode should both still be installed.
Review URL: http://codereview.chromium.org/6679009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77857 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/installer/setup/setup_main.cc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc index 48ff47d..0f0090d 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc @@ -1137,9 +1137,21 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance, // If --uninstall option is given, uninstall the identified product(s) if (is_uninstall) { const Products& products = installer_state.products(); - for (size_t i = 0; i < products.size(); ++i) { - install_status = UninstallProduct(original_state, installer_state, + // InstallerState::Initialize always puts Chrome first, and we rely on that + // here for this reason: if Chrome is in-use, the user will be prompted to + // confirm uninstallation. Upon cancel, we should not continue with the + // other products. + DCHECK(products.size() < 2 || products[0]->is_chrome()); + install_status = installer::UNINSTALL_SUCCESSFUL; // I'm an optimist. + installer::InstallStatus prod_status = installer::UNKNOWN_STATUS; + for (size_t i = 0; + install_status != installer::UNINSTALL_CANCELLED && + i < products.size(); + ++i) { + prod_status = UninstallProduct(original_state, installer_state, cmd_line, *products[i]); + if (prod_status != installer::UNINSTALL_SUCCESSFUL) + install_status = prod_status; } } else { // If --uninstall option is not specified, we assume it is install case. |