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..1fafd62d41e119562cfa4f4a2ceee9d3a0739c71 100644 |
--- a/chrome/installer/util/shell_util.h |
+++ b/chrome/installer/util/shell_util.h |
@@ -42,11 +42,16 @@ class ShellUtil { |
// Typical shortcut directories. Resolved in GetShortcutPath(). |
// Also used in ShortcutLocationIsSupported(). |
enum ShortcutLocation { |
- SHORTCUT_LOCATION_DESKTOP, |
+ SHORTCUT_LOCATION_FIRST = 0, |
+ SHORTCUT_LOCATION_DESKTOP = SHORTCUT_LOCATION_FIRST, |
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 + |
+ |
+ NUM_SHORTCUT_LOCATIONS |
}; |
enum ShortcutOperation { |
@@ -315,7 +320,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 +517,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, |