Index: chrome/installer/setup/install.cc |
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc |
index 13ff242d87ad18059d89d7e522292dc8f8df599e..b1ff4ac74a1c02f9379674bd6cfccab01155ae1d 100644 |
--- a/chrome/installer/setup/install.cc |
+++ b/chrome/installer/setup/install.cc |
@@ -629,8 +629,22 @@ 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 |
grt (UTC plus 2)
2015/07/09 14:24:22
nit: "default browser beacon" for consistency with
gab
2015/07/09 20:41:00
Done.
|
+ // can be done directly; whereas it requires triggering Active Setup for |
+ // each users' subsequent login on system-level installs. |
grt (UTC plus 2)
2015/07/09 14:24:22
english nit: users' -> user's ("each user" is sing
gab
2015/07/09 20:41:00
Done.
|
+ if (!installer_state.system_install()) { |
UpdateDefaultBrowserBeaconForPath(chrome_exe); |
+ } else { |
+ UpdateActiveSetupVersionWorkItem active_setup_work_item( |
+ InstallUtil::GetActiveSetupPath(chrome.distribution()), |
+ UpdateActiveSetupVersionWorkItem:: |
+ UPDATE_AND_BUMP_OS_UPGRADES_COMPONENT); |
+ if (active_setup_work_item.Do()) |
+ VLOG(1) << "Bumped Active Setup Version on-os-upgrade."; |
+ else |
+ LOG(ERROR) << "Bumping Active Setup Version on-os-upgrade failed."; |
grt (UTC plus 2)
2015/07/09 14:24:22
nit: it looks like more than half of the error mes
gab
2015/07/09 20:41:00
Sure, kind of redundant with "Error: (...)" but my
|
+ } |
} |
} |