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);
   }
+
+  // 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.

[gab, 2015/10/13 19:35:09]

Suggest changing this whole paragraph with something like:

// Move Start Menu shortcuts out of the deprecated chrome specific subfolder if
it exists. This needs to happen before the shortcut update below or it will
fail.

[bcwhite, 2015/10/15 18:29:35]

Done.

+  base::FilePath old_shortcut_path;
+  ShellUtil::GetShortcutPath(
+      ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR, dist,
+      shortcut_level, &old_shortcut_path);
+  if (base::PathExists(old_shortcut_path)) {
+    ShellUtil::MoveExistingShortcut(
+        shortcut_level, dist, start_menu_properties,
+        ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR,

[gab, 2015/10/13 19:35:09]

Rename SHORTCUT_LOCATION_START_MENU_CHROME_DIR to
SHORTCUT_LOCATION_START_MENU_CHROME_DIR_DEPRECATED to ensure that all affected
call sites are dealt with in this CL (and also for future documentation).

[bcwhite, 2015/10/15 18:29:35]

Done.

+        ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT);
+  }

[gab, 2015/10/13 19:35:09]

Also need to delete the subfolder on success.

I suggest changing MoveExistingShortcut() to MigrateShortcuts(old_dir, new_dir,
...). Which would move all existing shortcuts in |old_dir| out to the |new_dir|
and then delete |old_dir|.

[bcwhite, 2015/10/15 18:29:35]

Generally there is only the one but should there be others, say "uninstall
Chrome", from some long-ago install, should we really move that to the root
directory?  I think those would be better left under the sub-folder to avoid
clutter.

[gab, 2015/10/15 18:55:06]

I really think we should aim to delete the subfolder. And thus we should
probably move everything (e.g. potential custom shortcuts, etc.) out.

I'm not worried about the uninstall link (in fact we removed the cleanup code
for it recently, 2 years after its deprecation).
And on uninstall we nuke every shortcut that points to chrome.exe in known
locations so a simple uninstall should get rid of any weird cruft for unhappy
users (actually the uninstall link points to setup.exe but we could also add a
rule to clean those up if we care).

Edit: I just saw that you added logic to delete the folder if empty after the
move (e.g. the common case). Maybe that's actually better. Hmmm, @grt: WDYT?

[grt (UTC plus 2), 2015/10/19 17:28:44]

Hmm. I think leaving old custom shortcuts in the directory is probably best.
This satisfies the "minimize user surprise" goal of software. I like that the
old directory is removed when it's empty.

+
   ExecuteAndLogShortcutOperation(
-      ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR, dist,
+      ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT, dist,
       start_menu_properties, shortcut_operation);
 }
 
 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
@@ skipping 234 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