From 34268cafec75687b9f504a19f5279c1dfdec986b Mon Sep 17 00:00:00 2001 From: "robertshield@chromium.org" Date: Mon, 14 Sep 2009 23:40:26 +0000 Subject: Cause experimental builds to uninstall unconditionally with no UI. Review URL: http://codereview.chromium.org/203059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26179 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/installer/setup/install.cc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc index 8d75126..cf7505a 100644 --- a/chrome/installer/setup/install.cc +++ b/chrome/installer/setup/install.cc @@ -94,6 +94,12 @@ void AddUninstallShortcutWorkItems(HKEY reg_root, file_util::GetFilenameFromPath(exe_path)); uninstall_cmd.append(L"\" --"); uninstall_cmd.append(installer_util::switches::kUninstall); + +#ifdef CHROME_EXP_BUILD + uninstall_cmd.append(L" --"); + uninstall_cmd.append(installer_util::switches::kForceUninstall); +#endif + if (reg_root == HKEY_LOCAL_MACHINE) { uninstall_cmd.append(L" --"); uninstall_cmd.append(installer_util::switches::kSystemLevel); @@ -237,6 +243,12 @@ bool CreateOrUpdateChromeShortcuts(const std::wstring& exe_path, file_util::GetFilenameFromPath(exe_path)); std::wstring arguments(L" --"); arguments.append(installer_util::switches::kUninstall); + +#ifdef CHROME_EXP_BUILD + arguments.append(L" --"); + arguments.append(installer_util::switches::kForceUninstall); +#endif + if (system_install) { arguments.append(L" --"); arguments.append(installer_util::switches::kSystemLevel); -- cgit v1.1