Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(849)

Side by Side Diff: chrome/installer/setup/setup_main.cc

Issue 928713003: Allow --force-uninstall for SxS Chrome and disallow --self-destruct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/installer/setup/setup_main.h" 5 #include "chrome/installer/setup/setup_main.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <msi.h> 8 #include <msi.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #include <shlobj.h> 10 #include <shlobj.h>
(...skipping 1699 matching lines...) Expand 10 before | Expand all | Expand 10 after
1710 if (!com_initializer.succeeded()) { 1710 if (!com_initializer.succeeded()) {
1711 installer_state.WriteInstallerResult( 1711 installer_state.WriteInstallerResult(
1712 installer::OS_ERROR, IDS_INSTALL_OS_ERROR_BASE, NULL); 1712 installer::OS_ERROR, IDS_INSTALL_OS_ERROR_BASE, NULL);
1713 return installer::OS_ERROR; 1713 return installer::OS_ERROR;
1714 } 1714 }
1715 1715
1716 // Some command line options don't work with SxS install/uninstall 1716 // Some command line options don't work with SxS install/uninstall
1717 if (InstallUtil::IsChromeSxSProcess()) { 1717 if (InstallUtil::IsChromeSxSProcess()) {
1718 if (system_install || 1718 if (system_install ||
1719 prefs.is_multi_install() || 1719 prefs.is_multi_install() ||
1720 cmd_line.HasSwitch(installer::switches::kForceUninstall) || 1720 cmd_line.HasSwitch(installer::switches::kSelfDestruct) ||
1721 cmd_line.HasSwitch(installer::switches::kMakeChromeDefault) || 1721 cmd_line.HasSwitch(installer::switches::kMakeChromeDefault) ||
1722 cmd_line.HasSwitch(installer::switches::kRegisterChromeBrowser) || 1722 cmd_line.HasSwitch(installer::switches::kRegisterChromeBrowser) ||
1723 cmd_line.HasSwitch(installer::switches::kRemoveChromeRegistration) || 1723 cmd_line.HasSwitch(installer::switches::kRemoveChromeRegistration) ||
1724 cmd_line.HasSwitch(installer::switches::kInactiveUserToast) || 1724 cmd_line.HasSwitch(installer::switches::kInactiveUserToast) ||
1725 cmd_line.HasSwitch(installer::switches::kSystemLevelToast)) { 1725 cmd_line.HasSwitch(installer::switches::kSystemLevelToast)) {
1726 return installer::SXS_OPTION_NOT_SUPPORTED; 1726 return installer::SXS_OPTION_NOT_SUPPORTED;
1727 } 1727 }
1728 } 1728 }
1729 1729
1730 // Some command line options are no longer supported and must error out. 1730 // Some command line options are no longer supported and must error out.
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
1806 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT 1806 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
1807 // to pass through, since this is only returned on uninstall which is 1807 // to pass through, since this is only returned on uninstall which is
1808 // never invoked directly by Google Update. 1808 // never invoked directly by Google Update.
1809 return_code = InstallUtil::GetInstallReturnCode(install_status); 1809 return_code = InstallUtil::GetInstallReturnCode(install_status);
1810 } 1810 }
1811 1811
1812 VLOG(1) << "Installation complete, returning: " << return_code; 1812 VLOG(1) << "Installation complete, returning: " << return_code;
1813 1813
1814 return return_code; 1814 return return_code;
1815 } 1815 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698