Change shortcut install location to non-subdir.

chrome/installer/setup/install.cc

Index: chrome/installer/setup/install.cc
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index a076ca3a6efbd8ed4e23c021e2b10544f10d851c..13f954584d32acf6353bfcedd4b00b9d4cd61925 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -70,6 +70,9 @@ void LogShortcutOperation(ShellUtil::ShortcutLocation location,
     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(
@@ -116,7 +119,7 @@ void LogShortcutOperation(ShellUtil::ShortcutLocation location,
     VLOG(1) << message;
 }
 
-void ExecuteAndLogShortcutOperation(
+bool ExecuteAndLogShortcutOperation(
     ShellUtil::ShortcutLocation location,
     BrowserDistribution* dist,
     const ShellUtil::ShortcutProperties& properties,
@@ -125,7 +128,9 @@ void ExecuteAndLogShortcutOperation(
   if (!ShellUtil::CreateOrUpdateShortcut(location, dist, properties,
                                          operation)) {
     LogShortcutOperation(location, dist, properties, operation, true);
+    return false;
   }
+  return true;
 }
 
 void AddChromeToMediaPlayerList() {
@@ -434,9 +439,27 @@ void CreateOrUpdateShortcuts(
     // 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,