Refactoring installer shortcut deletion; adding dedicated shortcut update feature.

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 321 matching lines @@
 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 shortcut.";

[gab, 2013/04/30 19:20:33]

nit: s/shortcut/shortcuts

[huangs, 2013/04/30 20:52:10]

Done.

-  if (!ShellUtil::RemoveShortcut(ShellUtil::SHORTCUT_LOCATION_DESKTOP, dist,
-                                 target_exe, install_level, NULL)) {
+  if (!ShellUtil::RemoveShortcuts(ShellUtil::SHORTCUT_LOCATION_DESKTOP, dist,
+                                 install_level, target_exe)) {

[grt (UTC plus 2), 2013/04/30 19:59:53]

fix indentation for all of these

[huangs, 2013/04/30 20:52:10]

Done.

     LOG(WARNING) << "Failed to delete Desktop shortcut.";
   }
-  // Also try to delete the alternate desktop shortcut. It is not sufficient
-  // to do so upon failure of the above call as ERROR_FILE_NOT_FOUND on
-  // delete is considered success.
-  if (!ShellUtil::RemoveShortcut(
-          ShellUtil::SHORTCUT_LOCATION_DESKTOP, dist, target_exe, install_level,
-          &dist->GetAlternateApplicationName())) {
-    LOG(WARNING) << "Failed to delete alternate Desktop shortcut.";
-  }
 
   VLOG(1) << "Deleting Quick Launch shortcut.";

[gab, 2013/04/30 19:20:33]

nit: s/shortcut/shortcuts

[huangs, 2013/04/30 20:52:10]

Done.

-  if (!ShellUtil::RemoveShortcut(ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH,
-                                 dist, target_exe, install_level, NULL)) {
+  if (!ShellUtil::RemoveShortcuts(ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH,
+                                 dist, install_level, target_exe)) {
     LOG(WARNING) << "Failed to delete Quick Launch shortcut.";
   }
 
   VLOG(1) << "Deleting Start Menu shortcuts.";
-  if (!ShellUtil::RemoveShortcut(ShellUtil::SHORTCUT_LOCATION_START_MENU, dist,
-                                 target_exe, install_level, NULL)) {
+  if (!ShellUtil::RemoveShortcuts(ShellUtil::SHORTCUT_LOCATION_START_MENU, dist,

[gab, 2013/04/30 19:20:33]

Note to self (and huangs/calamity): this could easily be tweaked now to fix app
shortcut issue crbug.com/171645; the issue is that shortcuts to chrome.exe in
the Start Menu itself are not deleted because SHORTCUT_LOCATION_START_MENU is
currently the Google Chrome folder in the Start Menu (and thus doesn't look for
shortcuts in the Start Menu itself...).
This migration logic will probably need to include the Start Menu shortcuts so
it will be a good time to also fix their deletion :).

[huangs, 2013/04/30 20:52:10]

Let's worry about this after my App Launcher thing is done.  :)

+                                 install_level, target_exe)) {
     LOG(WARNING) << "Failed to delete Start Menu shortcuts.";
   }
 
   // Although the shortcut removal calls above will unpin their shortcut if they
   // result in a deletion (i.e. shortcut existed and pointed to |target_exe|),
   // it is possible for shortcuts to remain pinned while their parent shortcut
   // has been deleted or changed to point to another |target_exe|. Make sure all
   // pinned-to-taskbar shortcuts that point to |target_exe| are unpinned.
-  ShellUtil::RemoveTaskbarShortcuts(target_exe.value());
+  if (!ShellUtil::RemoveShortcuts(ShellUtil::SHORTCUT_LOCATION_TASKBAR_PINS,
+                                 dist, ShellUtil::CURRENT_USER, target_exe)) {

[gab, 2013/04/30 19:20:33]

nit: indent

[huangs, 2013/04/30 20:52:10]

Done.

+    LOG_IF(WARNING, base::win::GetVersion() >= base::win::VERSION_WIN7)
+        << "Failed to unpin taskbar shortcuts at user-level.";
+  }
 
   ShellUtil::RemoveStartScreenShortcuts(product.distribution(),
-                                        target_exe.value());
+                                        target_exe);
 }
 
 bool ScheduleParentAndGrandparentForDeletion(const base::FilePath& path) {
   base::FilePath parent_dir = path.DirName();
   bool ret = ScheduleFileSystemEntityForDeletion(parent_dir.value().c_str());
   if (!ret) {
     LOG(ERROR) << "Failed to schedule parent dir for deletion: "
                << parent_dir.value();
   } else {
     base::FilePath grandparent_dir(parent_dir.DirName());
@@ skipping 1027 matching lines @@
     // deletion unconditionally. If they are not empty, the session manager
     // will not delete them on reboot.
     ScheduleParentAndGrandparentForDeletion(target_path);
   } else if (DeleteApplicationProductAndVendorDirectories(target_path) ==
              installer::DELETE_FAILED) {
     *uninstall_status = installer::UNINSTALL_FAILED;
   }
 }
 
 }  // namespace installer