Change shortcut install location to non-subdir.

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>
 
@@ skipping 52 matching lines @@
     message.append("(maybe the shortcut doesn't exist?) ");
   message.append((properties.level == ShellUtil::CURRENT_USER) ? "per-user " :
                                                                  "all-users ");
   switch (location) {
     case ShellUtil::SHORTCUT_LOCATION_DESKTOP:
       message.append("Desktop ");
       break;
     case ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH:
       message.append("Quick Launch ");
       break;
+    case ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT:
+      message.append("Start menu ");
+      break;
     case ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR:
       message.append("Start menu/" +
                      base::UTF16ToUTF8(dist->GetStartMenuShortcutSubfolder(
                                      BrowserDistribution::SUBFOLDER_CHROME)) +
                       " ");
       break;
     case ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_APPS_DIR:
       message.append("Start menu/" +
                      base::UTF16ToUTF8(dist->GetStartMenuShortcutSubfolder(
                                      BrowserDistribution::SUBFOLDER_APPS)) +
@@ skipping 26 matching lines @@
   }
 
   message.push_back('.');
 
   if (failed)
     LOG(WARNING) << message;
   else
     VLOG(1) << message;
 }
 
-void ExecuteAndLogShortcutOperation(
+bool ExecuteAndLogShortcutOperation(
     ShellUtil::ShortcutLocation location,
     BrowserDistribution* dist,
     const ShellUtil::ShortcutProperties& properties,
     ShellUtil::ShortcutOperation operation) {
   LogShortcutOperation(location, dist, properties, operation, false);
   if (!ShellUtil::CreateOrUpdateShortcut(location, dist, properties,
                                          operation)) {
     LogShortcutOperation(location, dist, properties, operation, true);
+    return false;
   }
+  return true;
 }
 
 void AddChromeToMediaPlayerList() {
   base::string16 reg_path(installer::kMediaPlayerRegPath);
   // registry paths can also be appended like file system path
   reg_path.push_back(base::FilePath::kSeparators[0]);
   reg_path.append(installer::kChromeExe);
   VLOG(1) << "Adding Chrome to Media player list at " << reg_path;
   scoped_ptr<WorkItem> work_item(WorkItem::CreateCreateRegKeyWorkItem(
       HKEY_LOCAL_MACHINE, reg_path, WorkItem::kWow64Default));
@@ skipping 288 matching lines @@
   if (InstallUtil::ShouldInstallMetroProperties())
     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) {
     start_menu_properties.set_pin_to_taskbar(!do_not_create_taskbar_shortcut);
     // Disabled for now. TODO(gab): Remove this and the associated code if it
     // remains disabled long term.
     start_menu_properties.set_pin_to_start(false);
   }
-  ExecuteAndLogShortcutOperation(
-      ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR, dist,
-      start_menu_properties, shortcut_operation);
+  if (!ExecuteAndLogShortcutOperation(

[grt (UTC plus 2), 2015/09/22 20:28:53]

how does this interact with pins in the start screen/menu and taskbar? i don't
claim to understand shortcut code too much, but it seems safer to me to move the
existing shortcut from the "Google Chrome" folder (if the shortcut exists) up a
level to the main Start Menu\Programs folder. i would hope that Windows' link
tracking service will keep pins of it working. especially on Win10, where we
can't recreate the taskbar pin if the user had created it.

[gab, 2015/09/28 15:44:51]

Taskbar pinning creates a copy of the pinned shortcut and is only linked to the
original shortcut per its appid (but any shortcut with the same appid will do
the same, i.e. show "unpin from taskbar" in its context menu).

Not so sure about Win10 start menu pins though.

Moving sounds better either way, but requires adding move logic to ShellUtil,
perhaps something like ShellUtil::MoveShortcuts(current_location,
destination_location, dist) which would move shortcuts in |current_location| to
|destination_location| IFF the destination path of each shortcut doesn't exist,
otherwise only deleting the original shortcut (i.e. no overwrite), then you can
call that method unconditionally here.

+           ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT, dist,
+           start_menu_properties, shortcut_operation)) {

[gab, 2015/09/28 15:44:51]

If someone runs an over-install (re-install when existing install is present),
this call will succeed creating a shortcut in SHORTCUT_LOCATION_START_MENU_ROOT
and then won't proceed to cleaning up the existing shortcut (nor will it on
subsequent updates as updating the shortcut in root will work).

+    // We're migrating from shortcuts in a subdirectory to being directly in
+    // the list of "All Programs" which means the update may fail because it's
+    // not currently in the location we want it to go.  In this case, we have
+    // to explicitly remove the old one and force-create the new one.
+    base::FilePath shortcut_path;
+    ShellUtil::GetShortcutPath(
+        ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR, dist,
+        shortcut_level, &shortcut_path);
+    if (shortcut_operation == ShellUtil::SHELL_SHORTCUT_REPLACE_EXISTING &&
+        base::PathExists(shortcut_path)) {
+      ShellUtil::RemoveShortcuts(
+          ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR, dist,
+          shortcut_level, start_menu_properties.target);
+      ExecuteAndLogShortcutOperation(
+          ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT, dist,
+          start_menu_properties, ShellUtil::SHELL_SHORTCUT_CREATE_ALWAYS);
+    }
+  }
 }
 
 void RegisterChromeOnMachine(const installer::InstallerState& installer_state,
                              const installer::Product& product,
                              bool make_chrome_default) {
   DCHECK(product.is_chrome());
 
   // Try to add Chrome to Media Player shim inclusion list. We don't do any
   // error checking here because this operation will fail if user doesn't
   // have admin rights and we want to ignore the error.
@@ skipping 233 matching lines @@
   // Read master_preferences copied beside chrome.exe at install.
   MasterPreferences prefs(installation_root.AppendASCII(kDefaultMasterPrefs));
   base::FilePath chrome_exe(installation_root.Append(kChromeExe));
   CreateOrUpdateShortcuts(
       chrome_exe, chrome, prefs, CURRENT_USER, install_operation);
 
   UpdateDefaultBrowserBeaconForPath(chrome_exe);
 }
 
 }  // namespace installer