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

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

Issue 1231973002: Force restoration of Chrome's shortcuts when Active Setup kicks in in response to a major OS upgrad… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a4_use_as_workitem
Patch Set: 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 | « no previous file | chrome/installer/util/install_util.h » ('j') | chrome/installer/util/install_util.cc » ('J')
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 4a18004e547b6e84e7230be8d818af3b1427e7eb..f491d1f61290772a0492e78b0f2cf9c6a62e7105 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -655,6 +655,13 @@ void HandleActiveSetupForBrowser(const base::FilePath& installation_root,
const installer::Product& chrome,
bool force) {
DCHECK(chrome.is_chrome());
+
+ // If the shortcuts are not being forcefully created we may want to forcefully
+ // create them anyways if this Active Setup trigger is in response to an OS
+ // update.
+ force = force || InstallUtil::UpdateLastOSUpgradeHandledByActiveSetup(
+ chrome.distribution());
+
// Only create shortcuts on Active Setup if the first run sentinel is not
// present for this user (as some shortcuts used to be installed on first
// run and this could otherwise re-install shortcuts for users that have
« no previous file with comments | « no previous file | chrome/installer/util/install_util.h » ('j') | chrome/installer/util/install_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698