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

Unified Diff: chrome/installer/setup/uninstall.cc

Issue 14711006: Quick fix to get 7DA counts for unified Chrome / App Launcher. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/installer/setup/uninstall.cc
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 295028c86db6fc24a0fcbfb92a555ebf1de049e9..42d9a33e99959b9853abdfc62089e54488a6e5c9 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -1231,6 +1231,18 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
// Notify the shell that associations have changed since Chrome was likely
// unregistered.
SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, NULL, NULL);
+
+ // TODO(huangs): Implement actual migration code and remove the hack below.
+ // If the deprecated stand-alone App Launcher is absent, uninstall the
+ // "shadow" App launcher created.
+ if (original_state.GetProductState(false,
grt (UTC plus 2) 2013/05/07 20:52:02 I think you want simply: if (installer_state.i
grt (UTC plus 2) 2013/05/07 20:57:30 As discussed in person, this suggesting isn't quit
huangs 2013/05/08 01:22:02 Changed how existing App Launcher is detected; upd
huangs 2013/05/08 01:22:02 Also added check for multi-install, to prevent use
+ BrowserDistribution::CHROME_APP_HOST)) {
+ BrowserDistribution* shadow_app_launcher_dist =
+ BrowserDistribution::GetSpecificDistribution(
+ BrowserDistribution::CHROME_APP_HOST);
+ InstallUtil::DeleteRegistryKey(reg_root,
+ shadow_app_launcher_dist->GetVersionKey());
+ }
}
if (product.is_chrome_frame()) {
« chrome/installer/setup/install_worker.cc ('K') | « chrome/installer/setup/install_worker.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698