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 26 matching lines @@
     UNKNOWN_DEFAULT,
     NOT_DEFAULT,
     IS_DEFAULT,
   };
 
   // Typical shortcut directories. Resolved in GetShortcutPath().
   // Also used in ShortcutLocationIsSupported().
   enum ShortcutLocation {
     SHORTCUT_LOCATION_DESKTOP,
     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 +
   };
 
   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,
@@ skipping 256 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

[huangs, 2013/05/15 02:33:46]

Add "," back; I think Oxford comma improves readability for code.

[gab, 2013/05/15 21:26:38]

+1

[calamity, 2013/08/27 07:59:35]

Done.

+  // 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 194 matching lines @@
   // that target |target_exe|.
   // Returns true if all shortcuts pointing to |target_exe| are successfully
   // updated, including the case where no such shortcuts are found.
   static bool UpdateShortcuts(
       ShellUtil::ShortcutLocation location,
       BrowserDistribution* dist,
       ShellChange level,
       const base::FilePath& target_exe,
       const ShellUtil::ShortcutProperties& properties);
 
+

[huangs, 2013/05/15 02:33:46]

Delete extra line.

[calamity, 2013/08/27 07:59:35]

Done.

   // Sets |suffix| to the base 32 encoding of the md5 hash of this user's sid
   // preceded by a dot.
   // This is guaranteed to be unique on the machine and 27 characters long
   // (including the '.').
   // This suffix is then meant to be added to all registration that may conflict
   // with another user-level Chrome install.
   // Note that prior to Chrome 21, the suffix registered used to be the user's
   // username (see GetOldUserSpecificRegistrySuffix() below). We still honor old
   // installs registered that way, but it was wrong because some of the
   // characters allowed in a username are not allowed in a ProgId.
@@ skipping 16 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_