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

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

Issue 1214163008: Bump os-upgrade component of Active Setup version on-os-upgrade. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@active_setup_onosup_fixversion_forreal
Patch Set: partial review:grt Created 5 years, 6 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 | « no previous file | chrome/installer/setup/install_worker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/install.cc
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index 58272b7f454da3a8d6398b386d8d881894f23155..345b8f60a6920323088076ae104c70b442b3f3db 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -628,8 +628,21 @@ void HandleOsUpgradeForBrowser(const installer::InstallerState& installer_state,
UpdateOsUpgradeBeacon(installer_state.system_install(),
BrowserDistribution::GetDistribution());
- if (!installer_state.system_install())
+
+ // Update the per-user default-browser-beacon. For user-level installs this
+ // can be done directly; whereas it requires triggering Active Setup for
+ // each users' subsequent login on system-level installs.
+ if (!installer_state.system_install()) {
UpdateDefaultBrowserBeaconForPath(chrome_exe);
+ } else {
+ if (InstallUtil::UpdateActiveSetupVersion(chrome.distribution(),
+ InstallUtil::OS_UPGRADES,
+ InstallUtil::BUMP, 1)) {
+ VLOG(1) << "Bumped Active Setup Version on-os-upgrade.";
+ } else {
+ LOG(ERROR) << "Bumping Active Setup Version on-os-upgrade failed.";
+ }
+ }
}
}
« no previous file with comments | « no previous file | chrome/installer/setup/install_worker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698