Move app launcher and chrome apps shortcut strings into the installer

chrome/browser/shell_integration.h

Index: chrome/browser/shell_integration.h
diff --git a/chrome/browser/shell_integration.h b/chrome/browser/shell_integration.h
index f8559844e8d7df644f469c4825333001d33245c1..161050a6f34e24f18283f4ac52fb81f32763b155 100644
--- a/chrome/browser/shell_integration.h
+++ b/chrome/browser/shell_integration.h
@@ -110,9 +110,18 @@ class ShellIntegration {
   struct ShortcutLocations {
     ShortcutLocations();
 
+    bool InApplicationsMenu() const {
+      return in_applications_menu_root || in_applications_menu_chrome_subdir ||
+          in_applications_menu_chrome_apps_subdir;
+    }
+
     bool on_desktop;
-    bool in_applications_menu;
-    string16 applications_menu_subdir;
+
+    // For Windows, these refer to "Start Menu", "Start Menu/Google Chrome",
+    // and "Start Menu/Chrome Apps" respectively.
+    bool in_applications_menu_root;
+    bool in_applications_menu_chrome_subdir;
+    bool in_applications_menu_chrome_apps_subdir;

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

I don't think we ever need more than 1 of those at once; how about we make this
a single variable with enum?

e.g.,

ApplicationsMenuLocation {
  APP_LOCATION_NONE,
  APP_LOCATION_ROOT,
  APP_LOCATION_SUBDIR_CHROME,
  APP_LOCATION_SUBDIR_CHROMEAPPS,
}

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

Done.

 
     // For Windows, this refers to quick launch bar prior to Win7. In Win7,
     // this means "pin to taskbar". For Mac/Linux, this could be used for
@@ -123,7 +132,7 @@ class ShellIntegration {
     // For Linux, this refers to a shortcut which the system knows about (for
     // the purpose of identifying windows and giving them the correct
     // title/icon), but which does not show up in menus or search results.
-    // Ignored if in_applications_menu == true.
+    // Ignored if InApplicationsMenu() == true.
     bool hidden;
   };