Move app launcher and chrome apps shortcut strings into the installer

chrome/installer/util/shell_util.h

 // 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.
 //
 // This file declares methods that are useful for integrating Chrome in
 // Windows shell. These methods are all static and currently part of
 // ShellUtil class.
 
 #ifndef CHROME_INSTALLER_UTIL_SHELL_UTIL_H_
 #define CHROME_INSTALLER_UTIL_SHELL_UTIL_H_
@@ skipping 24 matching lines @@
   // Chrome's default handler state for a given protocol.
   enum DefaultState {
     UNKNOWN_DEFAULT,
     NOT_DEFAULT,
     IS_DEFAULT,
   };
 
   // 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 {
     // Create a new shortcut (overwriting if necessary).
     SHELL_SHORTCUT_CREATE_ALWAYS,
     // Create the per-user shortcut only if its system-level equivalent (with
     // the same name) is not present.
     SHELL_SHORTCUT_CREATE_IF_NO_SYSTEM_LEVEL,
     // Overwrite an existing shortcut (fail if the shortcut doesn't exist).
     // If the arguments are not specified on the new shortcut, keep the old
@@ skipping 248 matching lines @@
                               BrowserDistribution* dist,
                               ShellChange level,
                               base::FilePath* path);
 
   // Updates shortcut in |location| (or creates it if |options| specify
   // SHELL_SHORTCUT_CREATE_ALWAYS).
   // |dist| gives the type of browser distribution currently in use.
   // |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,
       const ShellUtil::ShortcutProperties& properties,
       ShellUtil::ShortcutOperation operation);
 
   // Returns the string "|icon_path|,|icon_index|" (see, for example,
   // http://msdn.microsoft.com/library/windows/desktop/dd391573.aspx).
   static string16 FormatIconLocation(const string16& icon_path, int icon_index);
 
@@ skipping 174 matching lines @@
                                         const string16& chrome_exe,
                                         const string16& unique_suffix,
                                         const string16& protocol,
                                         bool elevate_if_not_admin);
 
   // Removes installed shortcut(s) at |location|.
   // |level|: CURRENT_USER to remove per-user shortcuts, or SYSTEM_LEVEL to
   // 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,
                               BrowserDistribution* dist,
                               ShellChange level,
                               const base::FilePath& target_exe);
 
   // Applies the updates in |properties| to all matching shortcuts in
   // |location|, i.e.:
   // - the shortcut's original target is |target_exe|,
@@ skipping 36 matching lines @@
   // required by the base32 standard for inputs that aren't a multiple of 5
   // bytes.
   static string16 ByteArrayToBase32(const uint8* bytes, size_t size);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellUtil);
 };
 
 
 #endif  // CHROME_INSTALLER_UTIL_SHELL_UTIL_H_