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

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

Issue 1223933005: Make use of the new UpdateActiveSetupVersionWorkItem. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a3_cleanup_unused_param
Patch Set: merge up to r338517 Created 5 years, 5 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/chrome_installer.gypi ('k') | 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..409fa25218b65e6ddd5a747fb386d559d2dc4a61 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -24,6 +24,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/installer/setup/install_worker.h"
#include "chrome/installer/setup/setup_constants.h"
+#include "chrome/installer/setup/update_active_setup_version_work_item.h"
#include "chrome/installer/util/auto_launch_util.h"
#include "chrome/installer/util/beacons.h"
#include "chrome/installer/util/browser_distribution.h"
@@ -628,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
+ // can be done directly; whereas it requires triggering Active Setup for
+ // each user's subsequent login on system-level installs.
+ 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) << "Failed to bump Active Setup Version on-os-upgrade.";
+ }
}
}
« no previous file with comments | « chrome/chrome_installer.gypi ('k') | chrome/installer/setup/install_worker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698