Change shortcut install location to non-subdir.

chrome/installer/util/shell_util.h

 // 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 declares methods that are useful for integrating Chrome in
 // Windows shell. These methods are all static and currently part of
 // ShellUtil class.
 
 #ifndef CHROME_INSTALLER_UTIL_SHELL_UTIL_H_
 #define CHROME_INSTALLER_UTIL_SHELL_UTIL_H_
@@ skipping 36 matching lines @@
     IS_DEFAULT,
   };
 
   // Typical shortcut directories. Resolved in GetShortcutPath().
   // Also used in ShortcutLocationIsSupported().
   enum ShortcutLocation {
     SHORTCUT_LOCATION_FIRST = 0,
     SHORTCUT_LOCATION_DESKTOP = SHORTCUT_LOCATION_FIRST,
     SHORTCUT_LOCATION_QUICK_LAUNCH,
     SHORTCUT_LOCATION_START_MENU_ROOT,
-    SHORTCUT_LOCATION_START_MENU_CHROME_DIR,
+    SHORTCUT_LOCATION_START_MENU_CHROME_DIR_DEPRECATED,  // now placed in root
     SHORTCUT_LOCATION_START_MENU_CHROME_APPS_DIR,
     SHORTCUT_LOCATION_TASKBAR_PINS,  // base::win::VERSION_WIN7 +
     SHORTCUT_LOCATION_APP_SHORTCUTS,  // base::win::VERSION_WIN8 +
     NUM_SHORTCUT_LOCATIONS
   };
 
   enum ShortcutOperation {
     // Create a new shortcut (overwriting if necessary).
     SHELL_SHORTCUT_CREATE_ALWAYS,
     // Create the per-user shortcut only if its system-level equivalent (with
@@ skipping 236 matching lines @@
 
   // Returns true if |chrome_exe| is registered in HKLM with |suffix|.
   // Note: This only checks one deterministic key in HKLM for |chrome_exe| and
   // doesn't otherwise validate a full Chrome install in HKLM.
   static bool QuickIsChromeRegisteredInHKLM(BrowserDistribution* dist,
                                             const base::FilePath& chrome_exe,
                                             const base::string16& suffix);
 
   // Returns true if the current Windows version supports the presence of
   // shortcuts at |location|.
-  static bool ShortcutLocationIsSupported(ShellUtil::ShortcutLocation location);
+  static bool ShortcutLocationIsSupported(ShortcutLocation location);
 
   // Sets |path| to the path for a shortcut at the |location| desired for the
   // given |level| (CURRENT_USER for per-user path and SYSTEM_LEVEL for
   // all-users path).
   // Returns false on failure.
-  static bool GetShortcutPath(ShellUtil::ShortcutLocation location,
+  static bool GetShortcutPath(ShortcutLocation location,
                               BrowserDistribution* dist,
                               ShellChange level,
                               base::FilePath* path);
 
+  // Move an existing shortcut from |old_location| to |new_location| for the
+  // set |shortcut_level|.  If the folder containing |old_location| is then
+  // empty, it will be removed.
+  static bool MoveExistingShortcut(

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

formatting nit:
  static bool MoveExistingShortcut(ShortcutLocation old_location,
                                   ShortcutLocation new_location,
                                   BrowserDistribution* dist,
                                   const ShortcutProperties& properties);

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

Done.

[gab, 2015/10/20 18:25:59]

Sounds like running "git cl format" will fix a few of the afore-mentioned nits,
just making sure you know of that option :-).

[bcwhite, 2015/10/20 19:03:12]

Done.

+      ShortcutLocation old_location,
+      ShortcutLocation new_location,
+      BrowserDistribution* dist,
+      const ShortcutProperties& properties);
+
   // Updates shortcut in |location| (or creates it if |options| specify
   // SHELL_SHORTCUT_CREATE_ALWAYS).
   // |dist| gives the type of browser distribution currently in use.
   // |properties| and |operation| affect this method as described on their
   // invidividual definitions above.
   // |location| may be one of SHORTCUT_LOCATION_DESKTOP,
   // SHORTCUT_LOCATION_QUICK_LAUNCH, SHORTCUT_LOCATION_START_MENU_ROOT,
   // SHORTCUT_LOCATION_START_MENU_CHROME_DIR, or
   // SHORTCUT_LOCATION_START_MENU_CHROME_APPS_DIR.
   static bool CreateOrUpdateShortcut(
-      ShellUtil::ShortcutLocation location,
+      ShortcutLocation location,
       BrowserDistribution* dist,
-      const ShellUtil::ShortcutProperties& properties,
-      ShellUtil::ShortcutOperation operation);
+      const ShortcutProperties& properties,
+      ShortcutOperation operation);
 
   // Returns the string "|icon_path|,|icon_index|" (see, for example,
   // http://msdn.microsoft.com/library/windows/desktop/dd391573.aspx).
   static base::string16 FormatIconLocation(const base::FilePath& icon_path,
                                            int icon_index);
 
   // This method returns the command to open URLs/files using chrome. Typically
   // this command is written to the registry under shell\open\command key.
   // |chrome_exe|: the full path to chrome.exe
   static base::string16 GetChromeShellOpenCmd(const base::FilePath& chrome_exe);
@@ skipping 187 matching lines @@
                                         bool elevate_if_not_admin);
 
   // Removes installed shortcut(s) at |location|.
   // |level|: CURRENT_USER to remove per-user shortcuts, or SYSTEM_LEVEL to
   // remove all-users shortcuts.
   // |target_exe|: Shortcut target exe; shortcuts will only be deleted when
   // their target is |target_exe|.
   // If |location| is a Chrome-specific folder, it will be deleted as well.
   // Returns true if all shortcuts pointing to |target_exe| are successfully
   // deleted, including the case where no such shortcuts are found.
-  static bool RemoveShortcuts(ShellUtil::ShortcutLocation location,
+  static bool RemoveShortcuts(ShortcutLocation location,
                               BrowserDistribution* dist,
                               ShellChange level,
                               const base::FilePath& target_exe);
 
   // Updates the target of all shortcuts in |location| that satisfy the
   // following:
   // - the shortcut's original target is |old_target_exe|,
   // - the original arguments are non-empty.
   // If the shortcut's icon points to |old_target_exe|, then it also gets
   // redirected to |new_target_exe|.
   // Returns true if all updates to matching shortcuts are successful, including
   // the vacuous case where no matching shortcuts are found.
   static bool RetargetShortcutsWithArgs(
-      ShellUtil::ShortcutLocation location,
+      ShortcutLocation location,
       BrowserDistribution* dist,
       ShellChange level,
       const base::FilePath& old_target_exe,
       const base::FilePath& new_target_exe);
 
   typedef base::RefCountedData<base::CancellationFlag> SharedCancellationFlag;
 
   // Appends Chrome shortcuts with non-whitelisted arguments to |shortcuts| if
   // not NULL. If |do_removal|, also removes non-whitelisted arguments from
   // those shortcuts. This method will abort and return false if |cancel| is
   // non-NULL and gets set at any point during this call.
   static bool ShortcutListMaybeRemoveUnknownArgs(
-      ShellUtil::ShortcutLocation location,
+      ShortcutLocation location,
       BrowserDistribution* dist,
       ShellChange level,
       const base::FilePath& chrome_exe,
       bool do_removal,
       const scoped_refptr<SharedCancellationFlag>& cancel,
       std::vector<std::pair<base::FilePath, base::string16> >* shortcuts);
 
   // Sets |suffix| to the base 32 encoding of the md5 hash of this user's sid
   // preceded by a dot.
   // This is guaranteed to be unique on the machine and 27 characters long
@@ skipping 55 matching lines @@
   // application, as given to AddFileAssociations. All information associated
   // with this name will be deleted.
   static bool DeleteFileAssociations(const base::string16& prog_id);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellUtil);
 };
 
 
 #endif  // CHROME_INSTALLER_UTIL_SHELL_UTIL_H_