diff options
author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-20 22:26:53 +0000 |
---|---|---|
committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-20 22:26:53 +0000 |
commit | e4cdc665ff69c7ddff0ce5740592e735a108e0b7 (patch) | |
tree | c91e1db9eb240665a18d1d6c63289638cd677585 /chrome/installer/setup/main.cc | |
parent | 63357da39cd6d80467cdb90bb46c7933ab8609bc (diff) | |
download | chromium_src-e4cdc665ff69c7ddff0ce5740592e735a108e0b7.zip chromium_src-e4cdc665ff69c7ddff0ce5740592e735a108e0b7.tar.gz chromium_src-e4cdc665ff69c7ddff0ce5740592e735a108e0b7.tar.bz2 |
- If the exe rename command fails try calling Google Update to do the same job. This works when we are logged into XP/Vista as limited rights user.
- Update Google Update idl file that has the recently added COM object.
- Add --system-level to the rename command that gets added to the registry.
- Remove all the code to uninstall Gears MSI. Now most of the user have been upgraded to Chrome installer that includes gears.dll.
BUG=1463346
Review URL: http://codereview.chromium.org/11255
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5791 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup/main.cc')
-rwxr-xr-x | chrome/installer/setup/main.cc | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/chrome/installer/setup/main.cc b/chrome/installer/setup/main.cc index c3e417f..2332c8a 100755 --- a/chrome/installer/setup/main.cc +++ b/chrome/installer/setup/main.cc @@ -384,23 +384,6 @@ installer_util::InstallStatus InstallChrome(const CommandLine& cmd_line, } else if (install_status == installer_util::NEW_VERSION_UPDATED) { // This is temporary hack and will be deleted after one release. UpdateChromeOpenCmd(system_install); - -#if defined(GOOGLE_CHROME_BUILD) - // TODO(kuchhal): This is just temporary until all users move to the - // new Chromium version which ships with gears.dll. - LOG(INFO) << "Google Chrome updated. Uninstalling gears msi."; - wchar_t product[39]; // GUID + '\0' - MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); // Don't show any UI - for (int i = 0; - MsiEnumRelatedProducts(google_update::kGearsUpgradeCode, 0, - i, product) != ERROR_NO_MORE_ITEMS; ++i) { - LOG(INFO) << "Uninstalling Gears - " << product; - unsigned int ret = MsiConfigureProduct(product, - INSTALLLEVEL_MAXIMUM, INSTALLSTATE_ABSENT); - if (ret != ERROR_SUCCESS) - LOG(ERROR) << "Failed to uninstall Gears " << product; - } -#endif } } } |