Keep installing all-users Start Menu and Desktop shortcuts on system-level installs.

chrome/installer/setup/install.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/installer/setup/install.h"
 
 #include <windows.h>
 #include <shlobj.h>
 #include <time.h>
 #include <winuser.h>
@@ skipping 356 matching lines @@
               << " to " << src_path.value();
       return true;
     } else {
       PLOG(ERROR) << "Error writing " << installer::kVisualElementsManifest
                   << " to " << src_path.value();
       return false;
     }
   }
 }
 
 // TODO(tommi): Change this function to use WorkItemList.

[robertshield, 2012/12/10 20:58:28]

since we don't generally roll back on failure, you can remove this comment.

[gab, 2012/12/10 21:50:32]

Done.

 void CreateOrUpdateShortcuts(
     const FilePath& target,
     const Product& product,
     const MasterPreferences& prefs,
     InstallShortcutLevel install_level,
     InstallShortcutOperation install_operation) {
   // Extract shortcut preferences from |prefs|.
   bool do_not_create_desktop_shortcut = false;
   bool do_not_create_quick_launch_shortcut = false;
   bool alternate_desktop_shortcut = false;
@@ skipping 47 matching lines @@
         shortcut_operation == ShellUtil::SHELL_SHORTCUT_REPLACE_EXISTING) {
       desktop_properties.set_shortcut_name(dist->GetAlternateApplicationName());
       ExecuteAndLogShortcutOperation(
           ShellUtil::SHORTCUT_LOCATION_DESKTOP, dist, desktop_properties,
           shortcut_operation);
     }
   }
 
   if (!do_not_create_quick_launch_shortcut ||
       shortcut_operation == ShellUtil::SHELL_SHORTCUT_REPLACE_EXISTING) {
+    // There is no such thing as an all-users Quick Launch shortcut, always
+    // install the per-user shortcut.
+    ShellUtil::ShortcutProperties quick_launch_properties(base_properties);
+    quick_launch_properties.level = ShellUtil::CURRENT_USER;
     ExecuteAndLogShortcutOperation(
-        ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH, dist, base_properties,
-        shortcut_operation);
+        ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH, dist,
+        quick_launch_properties, shortcut_operation);
   }
 
   ShellUtil::ShortcutProperties start_menu_properties(base_properties);
   // IMPORTANT: Only the default (no arguments and default browserappid) browser
   // shortcut in the Start menu (Start screen on Win8+) should be made dual
   // mode.
   start_menu_properties.set_dual_mode(true);
   if (shortcut_operation == ShellUtil::SHELL_SHORTCUT_CREATE_ALWAYS ||
       shortcut_operation ==
           ShellUtil::SHELL_SHORTCUT_CREATE_IF_NO_SYSTEM_LEVEL) {
@@ skipping 106 matching lines @@
 
     const Product* chrome_product =
         installer_state.FindProduct(BrowserDistribution::CHROME_BROWSER);
     // Creates shortcuts for Chrome.
     if (chrome_product) {
       BrowserDistribution* dist = chrome_product->distribution();
       const FilePath chrome_exe(
           installer_state.target_path().Append(kChromeExe));
       CleanupLegacyShortcuts(installer_state, dist, chrome_exe);
 
+      // Install per-user shortcuts on user-level installs and all-users
+      // shortcuts on system-level installs. Note that Active Setup will take
+      // care of installing missing per-user shortcuts on system-level install
+      // (i.e., quick launch, taskbar pin, and possibly deleted all-users
+      // shortcuts).
+      InstallShortcutLevel install_level = installer_state.system_install() ?
+          ALL_USERS : CURRENT_USER;
+
       InstallShortcutOperation install_operation =
           INSTALL_SHORTCUT_REPLACE_EXISTING;
       if (result == installer::FIRST_INSTALL_SUCCESS ||
           result == installer::INSTALL_REPAIRED) {
         install_operation = INSTALL_SHORTCUT_CREATE_ALL;
       }
 
-      if (installer_state.system_install()) {
-        // Update existing all-users shortcuts for legacy installs.
-        CreateOrUpdateShortcuts(chrome_exe, *chrome_product, prefs, ALL_USERS,
-                                INSTALL_SHORTCUT_REPLACE_EXISTING);
-      }
-      // Always install per-user shortcuts (even on system-level installs where
-      // we do so for the installing user instead of waiting for Active Setup).
-      CreateOrUpdateShortcuts(chrome_exe, *chrome_product, prefs, CURRENT_USER,
+      CreateOrUpdateShortcuts(chrome_exe, *chrome_product, prefs, install_level,
                               install_operation);
     }
 
     if (chrome_product) {
       // Register Chrome and, if requested, make Chrome the default browser.
       installer_state.UpdateStage(installer::REGISTERING_CHROME);
 
       bool make_chrome_default = false;
       prefs.GetBool(master_preferences::kMakeChromeDefault,
                     &make_chrome_default);
@@ skipping 46 matching lines @@
   // Upon upgrading to Windows 8, we need to fix Chrome shortcuts and register
   // Chrome, so that Metro Chrome would work if Chrome is the default browser.
   if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
     VLOG(1) << "Updating and registering shortcuts.";
     // Read master_preferences copied beside chrome.exe at install.
     MasterPreferences prefs(
         installer_state.target_path().AppendASCII(kDefaultMasterPrefs));
 
     // Unfortunately, if this is a system-level install, we can't update the
     // shortcuts of each individual user (this only matters if this is an OS
-    // upgrade for XP/Vista to Win7+ as some properties are only set on
+    // upgrade from XP/Vista to Win7+ as some properties are only set on
     // shortcuts as of Win7).
     // At least attempt to update potentially existing all-users shortcuts.
     InstallShortcutLevel level = installer_state.system_install() ?
         ALL_USERS : CURRENT_USER;
     FilePath chrome_exe(installer_state.target_path().Append(kChromeExe));
     CreateOrUpdateShortcuts(
         chrome_exe, chrome, prefs, level, INSTALL_SHORTCUT_REPLACE_EXISTING);
     RegisterChromeOnMachine(installer_state, chrome, false);
   }
 }
 
 // NOTE: Should the work done here, on Active Setup, change: kActiveSetupVersion
 // in install_worker.cc needs to be increased for Active Setup to invoke this
 // again for all users of this install.
 void HandleActiveSetupForBrowser(const FilePath& installation_root,
                                  const Product& chrome,
                                  bool force) {
   DCHECK(chrome.is_chrome());
   // 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
   // already deleted them in the past).
   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 && file_util::PathExists(first_run_sentinel) ?
            INSTALL_SHORTCUT_REPLACE_EXISTING :
            INSTALL_SHORTCUT_CREATE_EACH_IF_NO_SYSTEM_LEVEL);
 
   // Read master_preferences copied beside chrome.exe at install.
   MasterPreferences prefs(installation_root.AppendASCII(kDefaultMasterPrefs));
   FilePath chrome_exe(installation_root.Append(kChromeExe));
   CreateOrUpdateShortcuts(
       chrome_exe, chrome, prefs, CURRENT_USER, install_operation);
 }
 
 }  // namespace installer