diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 23:40:26 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 23:40:26 +0000 |
| commit | 34268cafec75687b9f504a19f5279c1dfdec986b (patch) | |
| tree | 0ed3330659adee0812e74a91627c1346b44c86da | |
| parent | 447a51cad97fe5413535c28dae5265ee1ad3c9cc (diff) | |
| download | chromium_src-34268cafec75687b9f504a19f5279c1dfdec986b.zip chromium_src-34268cafec75687b9f504a19f5279c1dfdec986b.tar.gz chromium_src-34268cafec75687b9f504a19f5279c1dfdec986b.tar.bz2 | |
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
| -rw-r--r-- | chrome/installer/setup/install.cc | 12 |
1 files changed, 12 insertions, 0 deletions
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); |