Only remove Chrome shortcut if it points to the chrome.exe being uninstalled.

R=robertshield@chromium.org
BUG=148539
TEST=Install/uninstall user/system-level Chrome and verify that shortctus get properly deleted.


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

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

1 files changed, 15 insertions, 9 deletions

diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc
index e0ef41b..acb8c1d 100644
--- a/chrome/browser/chrome_browser_main_win.cc
+++ b/chrome/browser/chrome_browser_main_win.cc
@@ -140,15 +140,21 @@ int DoUninstallTasks(bool chrome_still_running) {
     // We want to remove user level shortcuts and we only care about the ones
     // created by us and not by the installer so |alternate| is false.
     BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-    if (!ShellUtil::RemoveChromeShortcut(
-            ShellUtil::SHORTCUT_DESKTOP, dist, ShellUtil::CURRENT_USER, NULL)) {
-      VLOG(1) << "Failed to delete desktop shortcut.";
-    }
-    // TODO(rlp): Cleanup profiles shortcuts.
-    if (!ShellUtil::RemoveChromeShortcut(
-            ShellUtil::SHORTCUT_QUICK_LAUNCH, dist, ShellUtil::CURRENT_USER,
-            NULL)) {
-      VLOG(1) << "Failed to delete quick launch shortcut.";
+    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.";
+      }
+      // 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();
     }
   }
   return result;