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_CHROME_DIR:
+    case ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT:
+      message.append("Start menu ");
+      break;
+    case ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR_DEPRECATED:
       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 25 matching lines @@
   }
 
   message.push_back('.');
 
   if (failed)
     LOG(WARNING) << message;
   else
     VLOG(1) << message;
 }
 
-void ExecuteAndLogShortcutOperation(
+bool ExecuteAndLogShortcutOperation(

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

this return value is unused. why introduce it?

[grt (UTC plus 2), 2015/10/20 18:10:30]

ping

[bcwhite, 2015/10/20 18:25:43]

I left it in in because it's not really extra code and could be useful in the
future.  But I'll remove it.

     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);
   }
+
+  // Move start-menu shortcuts out of the deprecated Chrome specific subfolder.

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

is plural correct here? is there ever more than one shortcut to be moved?

[bcwhite, 2015/10/20 16:02:13]

Done.

+  // This needs to happen before the shortcut update below or it will fail due

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

nit: "or it will" -> "or the latter will"

[bcwhite, 2015/10/20 16:02:13]

Done.

+  // to the existing shortcut not being in the location as the new one.

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

suggestion: "the existing shortcut not being in the location as the new one." ->
"an old shortcut in the product directory not having been moved into the
top-level Programs directory." or something like that.

[bcwhite, 2015/10/20 16:02:13]

That would be incorrect.  It fails below not because the old shortcut exists at
the old location but because the old shortcut does not exist at the new
location.  I added the missing word, "same" to make this clearer.

[grt (UTC plus 2), 2015/10/20 18:10:30]

I still find this wording awkward. The call to ExecuteAndLogShortcutOperation
will not work as desired with the move taking place first because an existing
shortcut hasn't been moved from the old to the new location, correct? "the
existing shortcut ... the new one." sounds to me like it's talking about two
different shortcuts, which isn't the case.

[bcwhite, 2015/10/20 18:25:43]

I see.  I think of it as two different shortcuts, one in the root and one in the
subfolder so it makes perfect sense to me.  I'll reword it.

+  base::FilePath old_shortcut_path;
+  ShellUtil::GetShortcutPath(
+      ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR_DEPRECATED, dist,
+      shortcut_level, &old_shortcut_path);
+  if (base::PathExists(old_shortcut_path)) {
+    ShellUtil::MoveExistingShortcut(
+        ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR_DEPRECATED,
+        ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT,
+        dist, shortcut_level, start_menu_properties);
+  }
+
   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