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

chrome/installer/util/shell_util.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.
 //
 // This file defines functions that integrate Chrome in Windows shell. These
 // functions can be used by Chrome as well as Chrome installer. All of the
 // work is done by the local functions defined in anonymous namespace in
 // this class.
 
 #include "chrome/installer/util/shell_util.h"
@@ skipping 1253 matching lines @@
          operation == SHELL_SHORTCUT_CREATE_IF_NO_SYSTEM_LEVEL);
 
   FilePath user_shortcut_path;
   FilePath system_shortcut_path;
   if (!GetShortcutPath(location, dist, CURRENT_USER, &user_shortcut_path) ||
       !GetShortcutPath(location, dist, SYSTEM_LEVEL, &system_shortcut_path) ||
       user_shortcut_path.empty() ||
       system_shortcut_path.empty()) {
     NOTREACHED();
     return false;
   }

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

clean up nit: we build and populate both user_shortcut_path and
system_shortcut_path but only ever use one of them. Would it not be better to
first decide which one we need, then build it? Doing so could considerably
shorten this method.

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

While it's true that we do not need the user-level when chosing the system-level
one; the opposite is not true (i.e. when using the user-level one we need to
make sure the system-level one doesn't exist) -- the check is only if operation
== SHELL_SHORTCUT_CREATE_IF_NO_SYSTEM_LEVEL so I agree that this could be
optimized, but I don't this belongs in this CL which needs to be merged in M24.

 
   string16 shortcut_name(ExtractShortcutNameFromProperties(dist, properties));
   user_shortcut_path = user_shortcut_path.Append(shortcut_name);
   system_shortcut_path = system_shortcut_path.Append(shortcut_name);
 
   FilePath *chosen_path;
+  bool should_install_shortcut = true;
   if (properties.level == SYSTEM_LEVEL) {
     // Install the system-level shortcut if requested.
     chosen_path = &system_shortcut_path;
   } else if (operation != SHELL_SHORTCUT_CREATE_IF_NO_SYSTEM_LEVEL ||
              !file_util::PathExists(system_shortcut_path)){
     // Otherwise install the user-level shortcut, unless the system-level
     // variant of this shortcut is present on the machine and |operation| states
     // not to create a user-level shortcut in that case.
     chosen_path = &user_shortcut_path;
   } else {
-    // Do not install anything if we are told to install a user-level shortcut,
-    // but the system-level variant of that shortcut is present.
-    chosen_path = &FilePath();
+    // Do not install any shortcut if we are told to install a user-level
+    // shortcut, but the system-level variant of that shortcut is present.
+    // Other actions (e.g., pinning) can still happen with respect to the
+    // existing system-level shortcut however.
+    chosen_path = &system_shortcut_path;
+    should_install_shortcut = false;
   }
 
-  // No shortcut needs to be created/updated.
-  if (chosen_path->empty())
-    return true;
-
-  base::win::ShortcutOperation shortcut_operation =
-      TranslateShortcutOperation(operation);
-  // Make sure the parent directories exist when creating the shortcut.
-  if (shortcut_operation == base::win::SHORTCUT_CREATE_ALWAYS &&
-      !file_util::CreateDirectory(chosen_path->DirName())) {
+  if (chosen_path == NULL || chosen_path->empty()) {
     NOTREACHED();
     return false;
   }
 
-  base::win::ShortcutProperties shortcut_properties(
-      TranslateShortcutProperties(properties));
-  bool ret = base::win::CreateOrUpdateShortcutLink(
-      *chosen_path, shortcut_properties, shortcut_operation);
+  base::win::ShortcutOperation shortcut_operation =
+      TranslateShortcutOperation(operation);
+  bool ret = true;
+  if (should_install_shortcut) {
+    // Make sure the parent directories exist when creating the shortcut.
+    if (shortcut_operation == base::win::SHORTCUT_CREATE_ALWAYS &&
+        !file_util::CreateDirectory(chosen_path->DirName())) {
+      NOTREACHED();
+      return false;
+    }
+
+    base::win::ShortcutProperties shortcut_properties(
+        TranslateShortcutProperties(properties));
+    ret = base::win::CreateOrUpdateShortcutLink(
+        *chosen_path, shortcut_properties, shortcut_operation);
+  }
 
   if (ret && shortcut_operation == base::win::SHORTCUT_CREATE_ALWAYS &&
       properties.pin_to_taskbar &&
       base::win::GetVersion() >= base::win::VERSION_WIN7) {
     ret = base::win::TaskbarPinShortcutLink(chosen_path->value().c_str());
     if (!ret) {
-      LOG(ERROR) << "The shorcut at " << chosen_path->value()
-                 << " was created, but the taskbar pin failed.";
+      LOG(ERROR) << "Failed to pin " << chosen_path->value();
     }
   }
 
   return ret;
 }
 
 string16 ShellUtil::FormatIconLocation(const string16& icon_path,
                                        int icon_index) {
   string16 icon_string(icon_path);
   icon_string.append(L",");
@@ skipping 627 matching lines @@
     // are any left...).
     if (free_bits >= 8 && next_byte_index < size) {
       free_bits -= 8;
       bit_stream += bytes[next_byte_index++] << free_bits;
     }
   }
 
   DCHECK_EQ(ret.length(), encoded_length);
   return ret;
 }