Refactor ShellUtil shortcut code -- single multi-purpose methods as opposed to many slighlty diffe…

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 238 matching lines @@
 // We try to remove the standard desktop shortcut but if that fails we try
 // to remove the alternate desktop shortcut. Only one of them should be
 // present in a given install but at this point we don't know which one.
 void DeleteChromeShortcuts(const InstallerState& installer_state,
                            const Product& product) {
   if (!product.is_chrome()) {
     VLOG(1) << __FUNCTION__ " called for non-CHROME distribution";
     return;
   }
 
+  BrowserDistribution* dist = product.distribution();
+
+  uint32 options =
+      installer_state.system_install() ? ShellUtil::SHORTCUT_SYSTEM_LEVEL :
+                                         ShellUtil::SHORTCUT_NO_OPTIONS;
+
+  VLOG(1) << "Deleting Desktop shortcut.";
+  if (!ShellUtil::RemoveChromeShortcut(
+          ShellUtil::SHORTCUT_DESKTOP, dist, options) &&
+      !ShellUtil::RemoveChromeShortcut(

[robertshield, 2012/08/22 21:39:07]

I suspect this will cause the second call to RemoveChromeShortcut to not happen
if the first one succeeds

+          ShellUtil::SHORTCUT_DESKTOP, dist,
+          options | ShellUtil::SHORTCUT_ALTERNATE)) {
+    LOG(WARNING) << "Failed to delete Desktop shortcut.";
+  }
+
+  VLOG(1) << "Deleting Quick Launch shortcut.";
+  if (!ShellUtil::RemoveChromeShortcut(
+          ShellUtil::SHORTCUT_QUICK_LAUNCH, dist, options)) {
+    LOG(WARNING) << "Failed to delete Quick Launch shortcut.";
+  }
+
   FilePath shortcut_path;
-  if (installer_state.system_install()) {
-    PathService::Get(base::DIR_COMMON_START_MENU, &shortcut_path);
-    if (!ShellUtil::RemoveChromeDesktopShortcut(
-        product.distribution(),
-        ShellUtil::CURRENT_USER | ShellUtil::SYSTEM_LEVEL,
-        ShellUtil::SHORTCUT_NO_OPTIONS)) {
-      ShellUtil::RemoveChromeDesktopShortcut(
-          product.distribution(),
-          ShellUtil::CURRENT_USER | ShellUtil::SYSTEM_LEVEL,
-          ShellUtil::SHORTCUT_ALTERNATE);
-    }
+  ShellUtil::GetShortcutPath(
+      ShellUtil::SHORTCUT_START_MENU, installer_state.system_install(),
+      &shortcut_path);
 
-    ShellUtil::RemoveChromeQuickLaunchShortcut(product.distribution(),
-        ShellUtil::CURRENT_USER | ShellUtil::SYSTEM_LEVEL);
+  if (shortcut_path.empty()) {
+    LOG(ERROR) << "Failed to get location for Start Menu shortcuts.";
   } else {
-    PathService::Get(base::DIR_START_MENU, &shortcut_path);
-    if (!ShellUtil::RemoveChromeDesktopShortcut(product.distribution(),
-        ShellUtil::CURRENT_USER, ShellUtil::SHORTCUT_NO_OPTIONS)) {
-      ShellUtil::RemoveChromeDesktopShortcut(product.distribution(),
-          ShellUtil::CURRENT_USER, ShellUtil::SHORTCUT_ALTERNATE);
-    }
-
-    ShellUtil::RemoveChromeQuickLaunchShortcut(product.distribution(),
-        ShellUtil::CURRENT_USER);
-  }
-  if (shortcut_path.empty()) {
-    LOG(ERROR) << "Failed to get location for shortcut.";
-  } else {
-    const string16 product_name(product.distribution()->GetAppShortCutName());
-    shortcut_path = shortcut_path.Append(product_name);
-
-    FilePath shortcut_link(shortcut_path.Append(product_name + L".lnk"));
+    const FilePath shortcut_link(
+        shortcut_path.Append(dist->GetAppShortCutName() + L".lnk"));
 
     VLOG(1) << "Unpinning shortcut at " << shortcut_link.value()
             << " from taskbar";
     // Ignore return value: keep uninstalling if the unpin fails.
     file_util::TaskbarUnpinShortcutLink(shortcut_link.value().c_str());
 
-    VLOG(1) << "Deleting shortcut " << shortcut_path.value();
+    VLOG(1) << "Deleting Start Menu shortcuts folder " << shortcut_path.value();
     if (!file_util::Delete(shortcut_path, true))
       LOG(ERROR) << "Failed to delete folder: " << shortcut_path.value();
   }
 }
 
 bool ScheduleParentAndGrandparentForDeletion(const FilePath& path) {
   FilePath parent_dir = path.DirName();
   bool ret = ScheduleFileSystemEntityForDeletion(parent_dir.value().c_str());
   if (!ret) {
     LOG(ERROR) << "Failed to schedule parent dir for deletion: "
@@ skipping 871 matching lines @@
 
   // Try and delete the preserved local state once the post-install
   // operations are complete.
   if (!backup_state_file.empty())
     file_util::Delete(backup_state_file, false);
 
   return ret;
 }
 
 }  // namespace installer