Move app launcher and chrome apps shortcut strings into the installer

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 59 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:
-      message.append("Start menu ");
+    case ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR:
+      message.append("Start menu/" +
+                     UTF16ToUTF8(dist->GetStartMenuShortcutSubfolder(
+                                 BrowserDistribution::SUBFOLDER_CHROME)) +

[gab, 2013/11/25 13:05:10]

nit: indent 4 more spaces here.

[calamity, 2013/11/26 02:51:17]

Done.

+                      " ");
+      break;
+    case ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_APPS_DIR:
+      message.append("Start menu/" +
+                     UTF16ToUTF8(dist->GetStartMenuShortcutSubfolder(
+                                 BrowserDistribution::SUBFOLDER_APPS)) +

[gab, 2013/11/25 13:05:10]

and here.

[calamity, 2013/11/26 02:51:17]

Done.

+                     " ");
       break;
     default:
       NOTREACHED();
   }
 
   message.push_back('"');
   if (properties.has_shortcut_name())
     message.append(UTF16ToUTF8(properties.shortcut_name));
   else
     message.append(UTF16ToUTF8(dist->GetDisplayName()));
@@ skipping 155 matching lines @@
 // this is a system-level install, also deletes the old Default user Quick
 // Launch shortcut. Both of these were created prior to Chrome 24; in Chrome 24,
 // the uninstall shortcut was removed and the Default user Quick Launch shortcut
 // was replaced by per-user shortcuts created via Active Setup.
 void CleanupLegacyShortcuts(const InstallerState& installer_state,
                             BrowserDistribution* dist,
                             const base::FilePath& chrome_exe) {
   ShellUtil::ShellChange shortcut_level = installer_state.system_install() ?
       ShellUtil::SYSTEM_LEVEL : ShellUtil::CURRENT_USER;
   base::FilePath uninstall_shortcut_path;
-  ShellUtil::GetShortcutPath(ShellUtil::SHORTCUT_LOCATION_START_MENU, dist,
-                             shortcut_level, &uninstall_shortcut_path);
+  ShellUtil::GetShortcutPath(ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR,
+                             dist, shortcut_level, &uninstall_shortcut_path);
   uninstall_shortcut_path = uninstall_shortcut_path.Append(
       dist->GetUninstallLinkName() + installer::kLnkExt);
   base::DeleteFile(uninstall_shortcut_path, false);
 
   if (installer_state.system_install()) {
     ShellUtil::RemoveShortcuts(
         ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH, dist,
         ShellUtil::SYSTEM_LEVEL, chrome_exe);
   }
 }
@@ skipping 181 matching lines @@
   // IMPORTANT: Only the default (no arguments and default browserappid) browser
   // shortcut in the Start menu (Start screen on Win8+) should be made dual
   // mode.
   start_menu_properties.set_dual_mode(true);
   if (!do_not_create_taskbar_shortcut &&
       (shortcut_operation == ShellUtil::SHELL_SHORTCUT_CREATE_ALWAYS ||
        shortcut_operation ==
            ShellUtil::SHELL_SHORTCUT_CREATE_IF_NO_SYSTEM_LEVEL)) {
     start_menu_properties.set_pin_to_taskbar(true);
   }
-  ExecuteAndLogShortcutOperation(ShellUtil::SHORTCUT_LOCATION_START_MENU,
-                                 dist, start_menu_properties,
-                                 shortcut_operation);
+  ExecuteAndLogShortcutOperation(
+      ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR, dist,
+      start_menu_properties, shortcut_operation);
 }
 
 void RegisterChromeOnMachine(const InstallerState& installer_state,
                              const 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
   // have admin rights and we want to ignore the error.
@@ skipping 221 matching lines @@
   if (app_host_path.empty())
     return false;
 
   CommandLine cmd(app_host_path);
   cmd.AppendSwitchASCII(::switches::kInstallFromWebstore, app_code);
   VLOG(1) << "App install command: " << cmd.GetCommandLineString();
   return base::LaunchProcess(cmd, base::LaunchOptions(), NULL);
 }
 
 }  // namespace installer