Move app launcher and chrome apps shortcut strings into the installer

chrome/browser/apps/shortcut_manager.cc

 // Copyright 2013 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/apps/shortcut_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
@@ skipping 23 matching lines @@
 
 using extensions::Extension;
 
 namespace {
 
 // Creates a shortcut for an application in the applications menu, if there is
 // not already one present.
 void CreateShortcutsInApplicationsMenu(
     const ShellIntegration::ShortcutInfo& shortcut_info) {
   ShellIntegration::ShortcutLocations creation_locations;
-  creation_locations.in_applications_menu = true;
+  creation_locations.in_applications_menu_root = true;

[gab, 2013/10/03 17:22:49]

We don't want it in the root, right?

[calamity, 2013/10/14 02:24:25]

Done.

   // Create the shortcut in the Chrome Apps subdir.
-  creation_locations.applications_menu_subdir =
-      web_app::GetAppShortcutsSubdirName();
+  creation_locations.in_applications_menu_chrome_apps_subdir = true;
   web_app::CreateShortcuts(shortcut_info, creation_locations,
                            web_app::SHORTCUT_CREATION_AUTOMATED);
 }
 
 bool ShouldCreateShortcutFor(const extensions::Extension* extension) {
   return extension->is_platform_app() &&
       extension->location() != extensions::Manifest::COMPONENT &&
       extension->ShouldDisplayInAppLauncher();
 }
 
@@ skipping 137 matching lines @@
           *it->get(), profile_, base::Bind(&CreateShortcutsInApplicationsMenu));
   }
 }
 
 void AppShortcutManager::DeleteApplicationShortcuts(
     const Extension* extension) {
   ShellIntegration::ShortcutInfo delete_info =
       web_app::ShortcutInfoForExtensionAndProfile(extension, profile_);
   web_app::DeleteAllShortcuts(delete_info);
 }