Move app launcher and chrome apps shortcut strings into the installer

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.h"
 
 #include <shlobj.h>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/md5.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/shortcut.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/launcher_support/chrome_launcher_support.h"
+#include "chrome/installer/util/browser_distribution.h"
+#include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/util_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/gfx/icon_util.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_family.h"
 
 namespace {
 
 const base::FilePath::CharType kIconChecksumFileExt[] =
     FILE_PATH_LITERAL(".ico.md5");
@@ skipping 256 matching lines @@
   }
 }
 
 void DeletePlatformShortcuts(
     const base::FilePath& web_app_path,
     const ShellIntegration::ShortcutInfo& shortcut_info) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
 
   // Get all possible locations for shortcuts.
   ShellIntegration::ShortcutLocations all_shortcut_locations;
-  all_shortcut_locations.in_applications_menu = true;
   all_shortcut_locations.in_quick_launch_bar = true;
   all_shortcut_locations.on_desktop = true;
   // Delete shortcuts from the Chrome Apps subdirectory.
   // This matches the subdir name set by CreateApplicationShortcutView::Accept
   // for Chrome apps (not URL apps, but this function does not apply for them).
+  all_shortcut_locations.in_applications_menu_chrome_apps_subdir = true;
   string16 start_menu_subdir = GetAppShortcutsSubdirName();

[Matt Giuca, 2013/05/15 05:19:45]

Move this line below to line 325 (start_menu_subdir is no longer needed up
here).

and .... (see below comment)

[gab, 2013/05/15 21:26:38]

In fact delete this line (see comment below).

[calamity, 2013/08/27 07:59:35]

Done.

-  all_shortcut_locations.applications_menu_subdir = start_menu_subdir;
-  std::vector<base::FilePath> shortcut_paths = GetShortcutPaths(
-      all_shortcut_locations);
+  std::vector<base::FilePath> shortcut_paths =
+      GetShortcutPaths(all_shortcut_locations);
   if (base::win::GetVersion() >= base::win::VERSION_WIN7)
     shortcut_paths.push_back(web_app_path);
 
   for (std::vector<base::FilePath>::const_iterator i = shortcut_paths.begin();
        i != shortcut_paths.end(); ++i) {
     std::vector<base::FilePath> shortcut_files =
         MatchingShortcutsForProfileAndExtension(*i, shortcut_info.profile_path,
             shortcut_info.title);
     for (std::vector<base::FilePath>::const_iterator j = shortcut_files.begin();
          j != shortcut_files.end(); ++j) {
       // Any shortcut could have been pinned, either by chrome or the user, so
       // they are all unpinned.
       base::win::TaskbarUnpinShortcutLink(j->value().c_str());
       file_util::Delete(*j, false);
     }
   }
 
   // If there are no more shortcuts in the Chrome Apps subdirectory, remove it.
   base::FilePath chrome_apps_dir;
   if (PathService::Get(base::DIR_START_MENU, &chrome_apps_dir)) {
     chrome_apps_dir = chrome_apps_dir.Append(start_menu_subdir);

[Matt Giuca, 2013/05/15 05:19:45]

.... why are you still using GetAppShortcutsSubdirName? It seems like you've
abstracted it away to ShellUtil in all other uses. I think this line should look
more like the new code in GetShortcutPaths -- can you use
ShellUtil::GetShortcutPath(ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_APPS_DIR,
....) to get this path?

I realise it's much longer than GetAppShortcutsSubdirName but it would be more
consistent.

[gab, 2013/05/15 21:26:38]

+1

[calamity, 2013/08/27 07:59:35]

Done.

     if (file_util::IsDirectoryEmpty(chrome_apps_dir))
       file_util::Delete(chrome_apps_dir, false);
   }
 }
 
 std::vector<base::FilePath> GetShortcutPaths(
     const ShellIntegration::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;
-    int location_id;
-    const wchar_t* subdir;
+    ShellUtil::ShortcutLocation location_id;
   } locations[] = {
     {
       creation_locations.on_desktop,
-      base::DIR_USER_DESKTOP,
-      NULL
+      ShellUtil::SHORTCUT_LOCATION_DESKTOP
     }, {
       creation_locations.in_applications_menu,
-      base::DIR_START_MENU,
-      creation_locations.applications_menu_subdir.empty() ? NULL :
-          creation_locations.applications_menu_subdir.c_str()
+      ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT
     }, {
-      creation_locations.in_quick_launch_bar,
-      // For Win7, in_quick_launch_bar means pinning to taskbar. Use
-      // base::PATH_START as a flag for this case.
-      (base::win::GetVersion() >= base::win::VERSION_WIN7) ?
-          base::PATH_START : base::DIR_APP_DATA,
-      (base::win::GetVersion() >= base::win::VERSION_WIN7) ?
-          NULL : L"Microsoft\\Internet Explorer\\Quick Launch"
+      creation_locations.in_applications_menu_chrome_subdir,
+      ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR,
+    }, {
+      creation_locations.in_applications_menu_chrome_apps_subdir,
+      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::GetVersion() < base::win::VERSION_WIN7,
+      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;
 
-      // Skip the Win7 case.
-      if (locations[i].location_id == base::PATH_START)
-        continue;
-
-      if (!PathService::Get(locations[i].location_id, &path)) {
+      if (!ShellUtil::GetShortcutPath(locations[i].location_id,
+                                      dist,
+                                      ShellUtil::CURRENT_USER,
+                                      &path)) {
+        NOTREACHED();
         continue;
       }
 
-      if (locations[i].subdir != NULL)
-        path = path.Append(locations[i].subdir);
       shortcut_paths.push_back(path);
     }
   }
   return shortcut_paths;
 }
 
 }  // namespace internals
 
 }  // namespace web_app