Move app launcher and chrome apps shortcut strings into the installer

chrome/browser/ui/views/create_application_shortcut_view.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/ui/views/create_application_shortcut_view.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 353 matching lines @@
 string16 CreateApplicationShortcutView::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(IDS_CREATE_SHORTCUTS_TITLE);
 }
 
 bool CreateApplicationShortcutView::Accept() {
   if (!IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK))
     return false;
 
   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_) {

[gab, 2013/10/17 15:13:31]

Use the ternary operator here as well (as suggested in
create_application_shortcuts_dialog_gtk.cc).

[calamity, 2013/11/20 05:43:30]

Done.

+      creation_locations.applications_menu_location =
+          ShellIntegration::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS;
+    } else {
+      creation_locations.applications_menu_location =
+          ShellIntegration::APP_MENU_LOCATION_ROOT;
+    }
+  }
 
 #if defined(OS_WIN)
   creation_locations.in_quick_launch_bar = quick_launch_check_box_ == NULL ?
       NULL : quick_launch_check_box_->checked();
 #elif defined(OS_POSIX)
   // Create shortcut in Mac dock or as Linux (gnome/kde) application launcher
   // are not implemented yet.
   creation_locations.in_quick_launch_bar = false;
 #endif
 
@@ skipping 36 matching lines @@
       weak_ptr_factory_(this)  {
 
   web_app::GetShortcutInfoForTab(web_contents_, &shortcut_info_);
   const WebApplicationInfo& app_info =
       extensions::TabHelper::FromWebContents(web_contents_)->web_app_info();
   if (!app_info.icons.empty()) {
     web_app::GetIconsInfo(app_info, &unprocessed_icons_);
     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();
 }
 
 CreateUrlApplicationShortcutView::~CreateUrlApplicationShortcutView() {
 }
 
 bool CreateUrlApplicationShortcutView::Accept() {
   if (!CreateApplicationShortcutView::Accept())
     return false;
@@ skipping 70 matching lines @@
     const base::Closure& close_callback)
         : CreateApplicationShortcutView(profile),
           app_(app),
           close_callback_(close_callback),
           weak_ptr_factory_(this) {
   // Required by InitControls().
   shortcut_info_.title = UTF8ToUTF16(app->name());
   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();
 
   // Get shortcut information and icon now; they are needed for our UI.
   web_app::UpdateShortcutInfoAndIconForApp(
       *app, profile,
       base::Bind(&CreateChromeApplicationShortcutView::OnShortcutInfoLoaded,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
@@ skipping 12 matching lines @@
 }
 
 // Called when the app's ShortcutInfo (with icon) is loaded.
 void CreateChromeApplicationShortcutView::OnShortcutInfoLoaded(
     const ShellIntegration::ShortcutInfo& shortcut_info) {
   shortcut_info_ = shortcut_info;
 
   CHECK(app_info_);
   static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon);
 }