Change shortcut install location to non-subdir.

chrome/installer/util/shell_util.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.
 //
 // This file defines functions that integrate Chrome in Windows shell. These
 // functions can be used by Chrome as well as Chrome installer. All of the
 // work is done by the local functions defined in anonymous namespace in
 // this class.
 
 #include "chrome/installer/util/shell_util.h"
@@ skipping 1710 matching lines @@
     NOTREACHED() << dir_key;
     return false;
   }
 
   if (!folder_to_append.empty())
     *path = path->Append(folder_to_append);
 
   return true;
 }
 
+bool ShellUtil::MoveExistingShortcut(
+    ShellUtil::ShellChange shortcut_level,
+    BrowserDistribution* dist,
+    const ShellUtil::ShortcutProperties& properties,
+    ShellUtil::ShortcutLocation old_location,
+    ShellUtil::ShortcutLocation new_location) {
+  // Explicitly whitelist locations to which this is applicable.
+  if (old_location != SHORTCUT_LOCATION_START_MENU_CHROME_DIR ||
+      new_location != SHORTCUT_LOCATION_START_MENU_ROOT) {
+    NOTREACHED();
+    return false;
+  }
+
+  base::string16 shortcut_name(
+      ExtractShortcutNameFromProperties(dist, properties));
+
+  base::FilePath old_shortcut_path;
+  base::FilePath new_shortcut_path;
+  ShellUtil::GetShortcutPath(
+      old_location, dist, shortcut_level, &old_shortcut_path);
+  ShellUtil::GetShortcutPath(
+      new_location, dist, shortcut_level, &new_shortcut_path);
+  old_shortcut_path = old_shortcut_path.Append(shortcut_name);
+  new_shortcut_path = new_shortcut_path.Append(shortcut_name);
+
+  return !!::MoveFile(old_shortcut_path.value().c_str(),
+                      new_shortcut_path.value().c_str());
+}
+
 bool ShellUtil::CreateOrUpdateShortcut(
     ShellUtil::ShortcutLocation location,
     BrowserDistribution* dist,
     const ShellUtil::ShortcutProperties& properties,
     ShellUtil::ShortcutOperation operation) {
   // Explicitly whitelist locations to which this is applicable.
   if (location != SHORTCUT_LOCATION_DESKTOP &&
       location != SHORTCUT_LOCATION_QUICK_LAUNCH &&
       location != SHORTCUT_LOCATION_START_MENU_ROOT &&
       location != SHORTCUT_LOCATION_START_MENU_CHROME_DIR &&
@@ skipping 824 matching lines @@
   base::string16 key_path(ShellUtil::kRegClasses);
   key_path.push_back(base::FilePath::kSeparators[0]);
   key_path.append(prog_id);
   return InstallUtil::DeleteRegistryKey(
       HKEY_CURRENT_USER, key_path, WorkItem::kWow64Default);
 
   // TODO(mgiuca): Remove the extension association entries. This requires that
   // the extensions associated with a particular prog_id are stored in that
   // prog_id's key.
 }