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

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

Issue 208393020: Fix the new First Run sentinel file path determination. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Simplify changes. Created 6 years, 9 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
Index: chrome/installer/setup/install.cc
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index 078a9ac7ff60c2cdc9ba49783fe45547b16832f8..e7cc375f145a408220736757167b814bc362f861 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -676,14 +676,11 @@ void HandleActiveSetupForBrowser(const base::FilePath& installation_root,
// 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
// already deleted them in the past).
- base::FilePath first_run_sentinel;
- InstallUtil::GetSentinelFilePath(
- chrome::kFirstRunSentinel, chrome.distribution(), &first_run_sentinel);
// Decide whether to create the shortcuts or simply replace existing
// shortcuts; if the decision is to create them, only shortcuts whose matching
// all-users shortcut isn't present on the system will be created.
InstallShortcutOperation install_operation =
- (!force && base::PathExists(first_run_sentinel) ?
+ (!force && InstallUtil::IsFirstRunSentinelPresent() ?
INSTALL_SHORTCUT_REPLACE_EXISTING :
INSTALL_SHORTCUT_CREATE_EACH_IF_NO_SYSTEM_LEVEL);

Powered by Google App Engine
This is Rietveld 408576698