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

Unified Diff: chrome/installer/setup/install_worker.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: Fixing mix-up between InstallationState and InstallationLevel. 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
« no previous file with comments | « chrome/browser/ui/views/app_list/app_list_controller_win.cc ('k') | chrome/installer/setup/uninstall.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/install_worker.cc
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
index 5450e32947b91e6495cd6d54f93d1a996e69c3ea..c92219032b35bd77ca230dade2043cdb6d4d4476 100644
--- a/chrome/installer/setup/install_worker.cc
+++ b/chrome/installer/setup/install_worker.cc
@@ -1223,6 +1223,21 @@ void AddInstallWorkItems(const InstallationState& original_state,
install_list);
}
+ // TODO(huangs): Implement actual migration code and remove the hack below.
+ // If installing Chrome without the legacy stand-alone App Launcher (to be
+ // handled later), add "shadow" App Launcher registry keys so Google Update
+ // would recognize the "dr" value in the App Launcher ClientState key.
+ // Checking .is_multi_install() excludes Chrome Canary and stand-alone Chrome.
+ if (installer_state.is_multi_install() &&
+ installer_state.FindProduct(BrowserDistribution::CHROME_BROWSER) &&
+ !installer_state.FindProduct(BrowserDistribution::CHROME_APP_HOST)) {
+ BrowserDistribution* shadow_app_launcher_dist =
+ BrowserDistribution::GetSpecificDistribution(
+ BrowserDistribution::CHROME_APP_HOST);
+ AddVersionKeyWorkItems(root, shadow_app_launcher_dist, new_version,
+ add_language_identifier, install_list);
+ }
+
// Add any remaining work items that involve special settings for
// each product.
AddProductSpecificWorkItems(original_state, installer_state, setup_path,
« no previous file with comments | « chrome/browser/ui/views/app_list/app_list_controller_win.cc ('k') | chrome/installer/setup/uninstall.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698