Move app launcher and chrome apps shortcut strings into the installer

chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.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/gtk/create_application_shortcuts_dialog_gtk.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/environment.h"
@@ skipping 192 matching lines @@
 }
 
 void CreateApplicationShortcutsDialogGtk::OnCreateDialogResponse(
     GtkWidget* widget, int response) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (response == GTK_RESPONSE_ACCEPT) {
     ShellIntegration::ShortcutLocations creation_locations;
     creation_locations.on_desktop =
         gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(desktop_checkbox_));
-    creation_locations.in_applications_menu =
-        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(menu_checkbox_));
-    creation_locations.applications_menu_subdir = shortcut_menu_subdir_;
+    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(menu_checkbox_))) {
+      if (create_in_chrome_apps_subdir_) {

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

I think this is simpler as:

creation_locations.applications_menu_location = create_in_chrome_apps_subdir_ ?
    ShellIntegration::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS :
    ShellIntegration::APP_MENU_LOCATION_ROOT;

[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;
+      }
+    }
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
         base::Bind(&CreateApplicationShortcutsDialogGtk::CreateDesktopShortcut,
                    this, shortcut_info_, creation_locations));
 
     OnCreatedShortcut();
   } else {
     Release();
   }
 }
 
@@ skipping 65 matching lines @@
 CreateWebApplicationShortcutsDialogGtk::CreateWebApplicationShortcutsDialogGtk(
     GtkWindow* parent,
     content::WebContents* web_contents)
   : CreateApplicationShortcutsDialogGtk(parent),
     web_contents_(web_contents) {
 
   // Get shortcut information now, it's needed for our UI.
   web_app::GetShortcutInfoForTab(web_contents, &shortcut_info_);
   CreateIconPixBuf(shortcut_info_.favicon);
 
-  // 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;
 
   CreateDialogBox(parent);
 }
 
 void CreateWebApplicationShortcutsDialogGtk::OnCreatedShortcut() {
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents_);
   if (browser)
     chrome::ConvertTabToAppWindow(browser, web_contents_);
 }
 
 CreateChromeApplicationShortcutsDialogGtk::
     CreateChromeApplicationShortcutsDialogGtk(
         GtkWindow* parent,
         Profile* profile,
         const Extension* app)
       : CreateApplicationShortcutsDialogGtk(parent),
         app_(app),
         profile_path_(profile->GetPath())  {
 
   // Place Chrome app shortcuts in the "Chrome Apps" submenu.
-  shortcut_menu_subdir_ = web_app::GetAppShortcutsSubdirName();
+  create_in_chrome_apps_subdir_ = true;
 
   // Get shortcut information and icon now; they are needed for our UI.
   web_app::UpdateShortcutInfoAndIconForApp(
       *app, profile,
       base::Bind(
           &CreateChromeApplicationShortcutsDialogGtk::OnShortcutInfoLoaded,
           this));
 }
 
 // Called when the app's ShortcutInfo (with icon) is loaded.
@@ skipping 13 matching lines @@
   if (web_app::CreateShortcutsOnFileThread(
           shortcut_info, creation_locations,
           web_app::SHORTCUT_CREATION_BY_USER)) {
     Release();
   } else {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         base::Bind(&CreateChromeApplicationShortcutsDialogGtk::ShowErrorDialog,
                    this));
   }
 }