Index: chrome/installer/setup/uninstall.cc |
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc |
index 146359fd05f1d4bc412ef31bddd62a705c045c54..0558b78a380df0a46d482a7fccfdbbd52d8312d8 100644 |
--- a/chrome/installer/setup/uninstall.cc |
+++ b/chrome/installer/setup/uninstall.cc |
@@ -26,7 +26,6 @@ |
#include "chrome/common/chrome_constants.h" |
#include "chrome/common/chrome_paths.h" |
#include "chrome/common/chrome_result_codes.h" |
-#include "chrome/installer/launcher_support/chrome_launcher_support.h" |
#include "chrome/installer/setup/install.h" |
#include "chrome/installer/setup/install_worker.h" |
#include "chrome/installer/setup/setup_constants.h" |
@@ -1282,23 +1281,14 @@ InstallStatus UninstallProduct(const InstallationState& original_state, |
// TODO(huangs): Implement actual migration code and remove the hack below. |
// Remove the "shadow" App Launcher registry keys. |
if (installer_state.is_multi_install()) { |
- // If we're not uninstalling the legacy App Launcher, and if it was |
gab
2014/07/25 12:25:13
The "legacy App Launcher" never shipped beyond Dev
grt (UTC plus 2)
2014/07/25 14:20:27
i don't really know. my understand is this (sam: p
|
- // not installed in the first place, then delete the "shadow" keys. |
- chrome_launcher_support::InstallationState level_to_check = |
- installer_state.system_install() ? |
- chrome_launcher_support::INSTALLED_AT_SYSTEM_LEVEL : |
- chrome_launcher_support::INSTALLED_AT_USER_LEVEL; |
- bool has_legacy_app_launcher = level_to_check == |
- chrome_launcher_support::GetAppLauncherInstallationState(); |
- if (!has_legacy_app_launcher) { |
- BrowserDistribution* shadow_app_launcher_dist = |
- BrowserDistribution::GetSpecificDistribution( |
- BrowserDistribution::CHROME_APP_HOST); |
- InstallUtil::DeleteRegistryKey( |
- reg_root, |
- shadow_app_launcher_dist->GetVersionKey(), |
- KEY_WOW64_32KEY); |
- } |
+ // Delete the "shadow" keys. |
+ BrowserDistribution* shadow_app_launcher_dist = |
+ BrowserDistribution::GetSpecificDistribution( |
+ BrowserDistribution::CHROME_APP_HOST); |
+ InstallUtil::DeleteRegistryKey( |
+ reg_root, |
+ shadow_app_launcher_dist->GetVersionKey(), |
+ KEY_WOW64_32KEY); |
} |
} |