Move app launcher and chrome apps shortcut strings into the installer

chrome/browser/ui/views/create_application_shortcut_view.cc

Index: chrome/browser/ui/views/create_application_shortcut_view.cc
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc
index 1a6b51e5c1a89c2e88126b7c1e6df4f5ac1ead26..87a581eb2dced5ed46abca65c5bcfd61e0b7f7fb 100644
--- a/chrome/browser/ui/views/create_application_shortcut_view.cc
+++ b/chrome/browser/ui/views/create_application_shortcut_view.cc
@@ -371,9 +371,12 @@ bool CreateApplicationShortcutView::Accept() {
 
   ShellIntegration::ShortcutLocations creation_locations;
   creation_locations.on_desktop = desktop_check_box_->checked();
-  creation_locations.in_applications_menu = menu_check_box_ == NULL ? false :
-      menu_check_box_->checked();
-  creation_locations.applications_menu_subdir = shortcut_menu_subdir_;
+  if (menu_check_box_ != NULL && menu_check_box_->checked()) {
+    if (create_in_chrome_apps_subdir_)
+      creation_locations.in_applications_menu_chrome_apps_subdir = true;
+    else
+      creation_locations.in_applications_menu_root = true;
+  }
 
 #if defined(OS_WIN)
   creation_locations.in_quick_launch_bar = quick_launch_check_box_ == NULL ?
@@ -430,8 +433,8 @@ CreateUrlApplicationShortcutView::CreateUrlApplicationShortcutView(
     FetchIcon();
   }
 
-  // NOTE: Leave shortcut_menu_subdir_ blank to create URL app shortcuts in the
-  // top-level menu.
+  // Create URL app shortcuts in the top-level menu.
+  create_in_chrome_apps_subdir_ = false;
 
   InitControls();
 }
@@ -522,7 +525,7 @@ CreateChromeApplicationShortcutView::CreateChromeApplicationShortcutView(
   shortcut_info_.description = UTF8ToUTF16(app->description());
 
   // Place Chrome app shortcuts in the "Chrome Apps" submenu.
-  shortcut_menu_subdir_ = web_app::GetAppShortcutsSubdirName();
+  create_in_chrome_apps_subdir_ = true;
 
   InitControls();