Change shortcut install location to non-subdir.

chrome/browser/web_applications/web_app_win.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/browser/web_applications/web_app_win.h"
 
 #include <shlobj.h>
 
 #include "base/command_line.h"
 #include "base/files/file_enumerator.h"
@@ skipping 547 matching lines @@
 
 std::vector<base::FilePath> GetShortcutPaths(
     const ShortcutLocations& creation_locations) {
   // Shortcut paths under which to create shortcuts.
   std::vector<base::FilePath> shortcut_paths;
   // Locations to add to shortcut_paths.
   struct {
     bool use_this_location;
     ShellUtil::ShortcutLocation location_id;
   } locations[] = {
-    {
-      creation_locations.on_desktop,
-      ShellUtil::SHORTCUT_LOCATION_DESKTOP
-    }, {
-      creation_locations.applications_menu_location == APP_MENU_LOCATION_ROOT,
-      ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT
-    }, {
-      creation_locations.applications_menu_location ==
-          APP_MENU_LOCATION_SUBDIR_CHROME,
-      ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR
-    }, {
-      creation_locations.applications_menu_location ==
-          APP_MENU_LOCATION_SUBDIR_CHROMEAPPS,
-      ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_APPS_DIR
-    }, {
-      // For Win7+, |in_quick_launch_bar| indicates that we are pinning to
-      // taskbar. This needs to be handled by callers.
-      creation_locations.in_quick_launch_bar &&
-          base::win::CanPinShortcutToTaskbar(),
-      ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH
-    }
-  };
+      {creation_locations.on_desktop, ShellUtil::SHORTCUT_LOCATION_DESKTOP},

[grt (UTC plus 2), 2015/10/22 17:31:11]

"git cl format" is very useful, but sometimes does things like this that make
the code more ugly. please back this formatting change out.

here's my workflow for formatting:
- git add <my various changes>
- git cl format
- git add -p
  (this gives you an interactive prompt to add or reject the formatting
changes.)
- git checkout -- .
  (this wipes out the formatting changes that were rejected)
- git commit

[bcwhite, 2015/10/23 17:22:14]

Done.

+      {creation_locations.applications_menu_location == APP_MENU_LOCATION_ROOT,
+       ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT},
+      {creation_locations.applications_menu_location ==
+           APP_MENU_LOCATION_SUBDIR_CHROME,
+       ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR_DEPRECATED},
+      {creation_locations.applications_menu_location ==
+           APP_MENU_LOCATION_SUBDIR_CHROMEAPPS,
+       ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_APPS_DIR},
+      {// For Win7+, |in_quick_launch_bar| indicates that we are pinning to
+       // taskbar. This needs to be handled by callers.
+       creation_locations.in_quick_launch_bar &&
+           base::win::CanPinShortcutToTaskbar(),
+       ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH}};
 
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   // Populate shortcut_paths.
   for (int i = 0; i < arraysize(locations); ++i) {
     if (locations[i].use_this_location) {
       base::FilePath path;
       if (!ShellUtil::GetShortcutPath(locations[i].location_id,
                                       dist,
                                       ShellUtil::CURRENT_USER,
                                       &path)) {
@@ skipping 14 matching lines @@
 
 }  // namespace internals
 
 void UpdateShortcutForTabContents(content::WebContents* web_contents) {
   // UpdateShortcutWorker will delete itself when it's done.
   UpdateShortcutWorker* worker = new UpdateShortcutWorker(web_contents);
   worker->Run();
 }
 
 }  // namespace web_app