Move app launcher and chrome apps shortcut strings into the installer

chrome/installer/setup/uninstall.cc

 // 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 defines the methods useful for uninstalling Chrome.
 
 #include "chrome/installer/setup/uninstall.h"
 
 #include <windows.h>
 
@@ skipping 327 matching lines @@
                                    const base::FilePath& new_target_exe) {
   if (installer_state.system_install()) {
     NOTREACHED();
     return;
   }
   BrowserDistribution* dist = product.distribution();
   ShellUtil::ShellChange install_level = ShellUtil::CURRENT_USER;
   ShellUtil::ShortcutProperties updated_properties(install_level);
   updated_properties.set_target(new_target_exe);
 
-  // TODO(huangs): Make this data-driven, along with DeleteShortcuts().
-  VLOG(1) << "Retargeting Desktop shortcuts.";
-  if (!ShellUtil::UpdateShortcutsWithArgs(
-          ShellUtil::SHORTCUT_LOCATION_DESKTOP, dist, install_level,
-          old_target_exe, updated_properties)) {
-    LOG(WARNING) << "Failed to retarget Desktop shortcuts.";
-  }
-
-  VLOG(1) << "Retargeting Quick Launch shortcuts.";
-  if (!ShellUtil::UpdateShortcutsWithArgs(
-          ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH, dist, install_level,
-          old_target_exe, updated_properties)) {
-    LOG(WARNING) << "Failed to retarget Quick Launch shortcuts.";
-  }
-
-  VLOG(1) << "Retargeting Start Menu shortcuts.";
-  if (!ShellUtil::UpdateShortcutsWithArgs(
-          ShellUtil::SHORTCUT_LOCATION_START_MENU, dist, install_level,
-          old_target_exe, updated_properties)) {
-    LOG(WARNING) << "Failed to retarget Start Menu shortcuts.";
-  }
-
-  // Retarget pinned-to-taskbar shortcuts that point to |chrome_exe|.
-  if (!ShellUtil::UpdateShortcutsWithArgs(
-          ShellUtil::SHORTCUT_LOCATION_TASKBAR_PINS, dist,
-          ShellUtil::CURRENT_USER, old_target_exe, updated_properties)) {
-    LOG(WARNING) << "Failed to retarget taskbar shortcuts at user-level.";
-  }
-
-  // Retarget the folder of secondary tiles from the start screen for |dist|.
-  if (!ShellUtil::UpdateShortcutsWithArgs(
-          ShellUtil::SHORTCUT_LOCATION_APP_SHORTCUTS, dist, install_level,
-          old_target_exe, updated_properties)) {
-    LOG(WARNING) << "Failed to retarget start-screen shortcuts.";
+  // Retarget all shortcuts that point to |old_target_exe| from all
+  // ShellUtil::ShortcutLocations.
+  VLOG(1) << "Retargeting shortcuts.";
+  for (int location = ShellUtil::SHORTCUT_LOCATION_START;

[grt (UTC plus 2), 2013/10/22 13:37:45]

if you use ShellUtil::ShortcutLocation rather than int here, can you not rid the
code of the static_cast below?

[gab, 2013/10/22 17:07:29]

Yes, but then you can't use ++ (enums are not iterable); you'd have to do
location = static_cast<ShellUtil::ShortcutLocation>(location + 1)  to increment
IIRC...

I think the current implementation is cleaner.

[grt (UTC plus 2), 2013/10/22 18:08:07]

agreed. i haven't been writing code enough recently. sigh. c++, you say? ;-)

+      location != ShellUtil::SHORTCUT_LOCATION_END; ++location) {
+    if (!ShellUtil::UpdateShortcutsWithArgs(
+            static_cast<ShellUtil::ShortcutLocation>(location), dist,
+            install_level, old_target_exe, updated_properties)) {
+      LOG(WARNING) << "Failed to retarget shortcuts with ShortcutLocation:"

[huangs, 2013/10/17 19:13:35]

NIT: Space after ":".

[grt (UTC plus 2), 2013/10/22 13:37:45]

nit: "with" -> "in"

[calamity, 2013/11/20 05:43:30]

Done.

[calamity, 2013/11/20 05:43:30]

Done.

+                   << location;
+    }
   }
 }
 
 // Deletes shortcuts at |install_level| from Start menu, Desktop,
 // Quick Launch, taskbar, and secondary tiles on the Start Screen (Win8+).
 // Only shortcuts pointing to |target_exe| will be removed.
 void DeleteShortcuts(const InstallerState& installer_state,
                      const Product& product,
                      const base::FilePath& target_exe) {
   BrowserDistribution* dist = product.distribution();
 
   // The per-user shortcut for this user, if present on a system-level install,
   // has already been deleted in chrome_browser_main_win.cc::DoUninstallTasks().
   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.
+  VLOG(1) << "Deleting shortcuts.";
+  for (int location = ShellUtil::SHORTCUT_LOCATION_START;

[grt (UTC plus 2), 2013/10/22 13:37:45]

int -> ShellUtil::ShortcutLocation

[gab, 2013/10/22 17:07:29]

Same here.

[calamity, 2013/11/20 05:43:30]

Done.

[calamity, 2013/11/20 05:43:30]

Done.

+      location != ShellUtil::SHORTCUT_LOCATION_END; ++location) {
+    if (!ShellUtil::RemoveShortcuts(
+            static_cast<ShellUtil::ShortcutLocation>(location), dist,
+            install_level, target_exe)) {
+      LOG(WARNING) << "Failed to delete shortcuts with ShortcutLocation:"

[huangs, 2013/10/17 19:13:35]

NIT: Space after ":".

[grt (UTC plus 2), 2013/10/22 13:37:45]

nit: "with" -> "in"

[gab, 2013/10/22 17:07:29]

Given this is the ID of the shortcut location I think no space is slightly
better, e.g.,

... in ShortcutLocation:5

[calamity, 2013/11/20 05:43:30]

Done.

+                   << location;
+    }
   }
 
   // Unpin all pinned-to-taskbar shortcuts that point to |chrome_exe|.
   if (!ShellUtil::RemoveShortcuts(ShellUtil::SHORTCUT_LOCATION_TASKBAR_PINS,

[gab, 2013/10/17 15:13:31]

SHORTCUT_LOCATION_TASKBAR_PINS will be processed above as well.

GetShortcutPaths always returns CURRENT_USER for SHORTCUT_LOCATION_TASKBAR_PINS:
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/installer/u...

So I think it's fine to remove this block altogether.

On user-level installs this won't make a difference and on system-level installs
it will do the right thing (although we should really just do a second pass at
CURRENT_USER for system-level installs; instead of relying on
chrome_browser_main.cc as I highlighted there).

[calamity, 2013/11/20 05:43:30]

Done.

                                   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) {
   base::FilePath parent_dir = path.DirName();
   bool ret = ScheduleFileSystemEntityForDeletion(parent_dir);
   if (!ret) {
     LOG(ERROR) << "Failed to schedule parent dir for deletion: "
                << parent_dir.value();
   } else {
     base::FilePath grandparent_dir(parent_dir.DirName());
@@ skipping 1055 matching lines @@
     // If we need a reboot to continue, schedule the parent directories for
     // deletion unconditionally. If they are not empty, the session manager
     // will not delete them on reboot.
     ScheduleParentAndGrandparentForDeletion(target_path);
   } else if (DeleteChromeDirectoriesIfEmpty(target_path) == DELETE_FAILED) {
     *uninstall_status = UNINSTALL_FAILED;
   }
 }
 
 }  // namespace installer