Move app launcher and chrome apps shortcut strings into the installer

chrome/installer/util/shell_util.h

Index: chrome/installer/util/shell_util.h
diff --git a/chrome/installer/util/shell_util.h b/chrome/installer/util/shell_util.h
index 4c50356adf3f30fa62e3b98ee1c09fe3bb0f5dfd..9a0f6023ec76f30132a9c81701ce06241383be14 100644
--- a/chrome/installer/util/shell_util.h
+++ b/chrome/installer/util/shell_util.h
@@ -42,11 +42,17 @@ class ShellUtil {
   // Typical shortcut directories. Resolved in GetShortcutPath().
   // Also used in ShortcutLocationIsSupported().
   enum ShortcutLocation {
-    SHORTCUT_LOCATION_DESKTOP,
+    SHORTCUT_LOCATION_BEGIN = 0,

[gab, 2013/11/21 05:50:19]

I would prefer SHORTCUT_LOCATION_FIRST here.

[calamity, 2013/11/21 06:52:46]

Done.

+    SHORTCUT_LOCATION_DESKTOP = SHORTCUT_LOCATION_BEGIN,
     SHORTCUT_LOCATION_QUICK_LAUNCH,
-    SHORTCUT_LOCATION_START_MENU,
+    SHORTCUT_LOCATION_START_MENU_ROOT,
+    SHORTCUT_LOCATION_START_MENU_CHROME_DIR,
+    SHORTCUT_LOCATION_START_MENU_CHROME_APPS_DIR,
     SHORTCUT_LOCATION_TASKBAR_PINS,  // base::win::VERSION_WIN7 +
     SHORTCUT_LOCATION_APP_SHORTCUTS,  // base::win::VERSION_WIN8 +
+
+    // This always appears last.

[gab, 2013/11/21 05:50:19]

I think this is a fairly common idiom (I don't think a comment is required, the
name and no-leading comma are sufficient IMO.

[calamity, 2013/11/21 06:52:46]

Removed comment. I don't understand what you mean by 'no-leading comma'. Did
this mean leave the blank line?

[gab, 2013/11/21 19:52:24]

Nah, remove the blank line; my bad, I meant "no-trailing comma", i.e., usually
we ask that the last enum entry have a trailing comma, except when that entry
should always remain last.

So my point was that given its name and the fact it doesn't have a trailing
comma, it's obvious that this should remain last.

[calamity, 2013/11/24 23:55:15]

Done.

+    NUM_SHORTCUT_LOCATION

[gab, 2013/11/21 05:50:19]

NUM_SHORTCUT_LOCATIONS

[calamity, 2013/11/21 06:52:46]

Done.

   };
 
   enum ShortcutOperation {
@@ -315,7 +321,9 @@ class ShellUtil {
   // |properties| and |operation| affect this method as described on their
   // invidividual definitions above.
   // |location| may be one of SHORTCUT_LOCATION_DESKTOP,
-  // SHORTCUT_LOCATION_QUICK_LAUNCH, or SHORTCUT_LOCATION_START_MENU.
+  // SHORTCUT_LOCATION_QUICK_LAUNCH, SHORTCUT_LOCATION_START_MENU_ROOT,
+  // SHORTCUT_LOCATION_START_MENU_CHROME_DIR, or
+  // SHORTCUT_LOCATION_START_MENU_CHROME_APPS_DIR.
   static bool CreateOrUpdateShortcut(
       ShellUtil::ShortcutLocation location,
       BrowserDistribution* dist,
@@ -510,8 +518,7 @@ class ShellUtil {
   // remove all-users shortcuts.
   // |target_exe|: Shortcut target exe; shortcuts will only be deleted when
   // their target is |target_exe|.
-  // If |location| is SHORTCUT_LOCATION_START_MENU, the shortcut folder specific
-  // to |dist| is deleted.
+  // If |location| is a Chrome-specific folder, it will be deleted as well.
   // Returns true if all shortcuts pointing to |target_exe| are successfully
   // deleted, including the case where no such shortcuts are found.
   static bool RemoveShortcuts(ShellUtil::ShortcutLocation location,