No longer install all-users shortcuts on system-level installs; instead install per-user shortcuts through Active Setup.

Design doc: https://docs.google.com/a/chromium.org/document/d/1FjFbmKVj0BIP7xBXMs4lLgQcrc--Jl5jiMiwdDxLeOs/edit

BUG=148539
TEST=Shortcuts work as described in the design doc :)!
installer_util_unittests.exe --gtest_filter=ShellUtilShortcut*
setup_unittests.exe --gtest_filter=InstallShortcutTest*

Review URL: https://chromiumcodereview.appspot.com/11229010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164849 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 9 deletions

diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc
index acb8c1d..3731ac1 100644
--- a/chrome/browser/chrome_browser_main_win.cc
+++ b/chrome/browser/chrome_browser_main_win.cc
@@ -142,17 +142,20 @@ int DoUninstallTasks(bool chrome_still_running) {
     BrowserDistribution* dist = BrowserDistribution::GetDistribution();
     FilePath chrome_exe;
     if (PathService::Get(base::FILE_EXE, &chrome_exe)) {
-      if (!ShellUtil::RemoveChromeShortcut(
-              ShellUtil::SHORTCUT_DESKTOP, dist, chrome_exe.value(),
-              ShellUtil::CURRENT_USER, NULL)) {
-        VLOG(1) << "Failed to delete desktop shortcut.";
+      ShellUtil::ChromeShortcutLocation user_shortcut_locations[] = {
+        ShellUtil::SHORTCUT_DESKTOP,
+        ShellUtil::SHORTCUT_QUICK_LAUNCH,
+        ShellUtil::SHORTCUT_START_MENU,
+      };
+      for (size_t i = 0; i < arraysize(user_shortcut_locations); ++i) {
+        if (!ShellUtil::RemoveChromeShortcut(
+                user_shortcut_locations[i], dist, chrome_exe.value(),
+                ShellUtil::CURRENT_USER, NULL)) {
+          VLOG(1) << "Failed to delete shortcut at location "
+                  << user_shortcut_locations[i];
+        }
       }
       // TODO(rlp): Cleanup profiles shortcuts.
-      if (!ShellUtil::RemoveChromeShortcut(
-              ShellUtil::SHORTCUT_QUICK_LAUNCH, dist, chrome_exe.value(),
-              ShellUtil::CURRENT_USER, NULL)) {
-        VLOG(1) << "Failed to delete quick launch shortcut.";
-      }
     } else {
       NOTREACHED();
     }