Move app launcher and chrome apps shortcut strings into the installer

chrome/installer/setup/uninstall.cc

Index: chrome/installer/setup/uninstall.cc
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 3518a46410f8143bec79b8eea5331b7506a962bd..e22eeff5742722c116ac3d36e6aa3c34f9ba3872 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -395,22 +395,15 @@ void DeleteShortcuts(const InstallerState& installer_state,
   ShellUtil::ShellChange install_level = installer_state.system_install() ?
       ShellUtil::SYSTEM_LEVEL : ShellUtil::CURRENT_USER;
 
-  VLOG(1) << "Deleting Desktop shortcuts.";
-  if (!ShellUtil::RemoveShortcuts(ShellUtil::SHORTCUT_LOCATION_DESKTOP, dist,
-                                  install_level, target_exe)) {
-    LOG(WARNING) << "Failed to delete Desktop shortcuts.";
-  }
-
-  VLOG(1) << "Deleting Quick Launch shortcuts.";
-  if (!ShellUtil::RemoveShortcuts(ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH,
-                                  dist, install_level, target_exe)) {
-    LOG(WARNING) << "Failed to delete Quick Launch shortcuts.";
-  }
-
-  VLOG(1) << "Deleting Start Menu shortcuts.";
-  if (!ShellUtil::RemoveShortcuts(ShellUtil::SHORTCUT_LOCATION_START_MENU, dist,
-                                  install_level, target_exe)) {
-    LOG(WARNING) << "Failed to delete Start Menu shortcuts.";
+  // Delete and unpin all shortcuts that point to |target_exe| from all
+  // ShellUtil::ShortcutLocations.
+  for (ShellUtil::ShortcutLocation location = SHORTCUT_LOCATION_START;
+      location != SHORTCUT_LOCATION_END; ++location) {
+    if (!ShellUtil::RemoveShortcuts(location, dist, install_level,
+                                    target_exe)) {
+      LOG(WARNING) << "Failed to delete shortcuts with ShortcutLocation:"
+                   << location;
+    }
   }
 
   // Unpin all pinned-to-taskbar shortcuts that point to |chrome_exe|.
@@ -418,12 +411,6 @@ void DeleteShortcuts(const InstallerState& installer_state,
                                   dist, ShellUtil::CURRENT_USER, target_exe)) {
     LOG(WARNING) << "Failed to unpin taskbar shortcuts at user-level.";
   }
-
-  // Delete the folder of secondary tiles from the start screen for |dist|.
-  if (!ShellUtil::RemoveShortcuts(ShellUtil::SHORTCUT_LOCATION_APP_SHORTCUTS,
-                                  dist, install_level, target_exe)) {
-    LOG(WARNING) << "Failed to delete start-screen shortcuts.";
-  }
 }
 
 bool ScheduleParentAndGrandparentForDeletion(const base::FilePath& path) {