Wire the alternate desktop shortcut text

- second set of changes, one small one to come
- adds a parameter on the desktop shortcut creator function that indicate the text to use
- plumbs the master preference and the command line parameter

BUG=1522969


Review URL: http://codereview.chromium.org/42586

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

2 files changed, 6 insertions, 5 deletions

diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc
index a2fbd06..e5b0dd4 100644
--- a/chrome/browser/browser_main_win.cc
+++ b/chrome/browser/browser_main_win.cc
@@ -63,8 +63,9 @@ int DoUninstallTasks(bool chrome_still_running) {
   ResultCodes::ExitCode ret = ResultCodes::NORMAL_EXIT;
   if (!FirstRun::RemoveSentinel())
     ret = ResultCodes::UNINSTALL_DELETE_FILE_ERROR;
-  // We only want to modify user level shortcuts so pass false for system_level.
-  if (!ShellUtil::RemoveChromeDesktopShortcut(ShellUtil::CURRENT_USER))
+  // 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.
+  if (!ShellUtil::RemoveChromeDesktopShortcut(ShellUtil::CURRENT_USER, false))
     ret = ResultCodes::UNINSTALL_DELETE_FILE_ERROR;
   if (!ShellUtil::RemoveChromeQuickLaunchShortcut(ShellUtil::CURRENT_USER))
     ret = ResultCodes::UNINSTALL_DELETE_FILE_ERROR;
diff --git a/chrome/browser/first_run.cc b/chrome/browser/first_run.cc
index d38f76a..6e57f42 100644
--- a/chrome/browser/first_run.cc
+++ b/chrome/browser/first_run.cc
@@ -170,7 +170,7 @@ bool FirstRun::CreateChromeDesktopShortcut() {
     return false;
   return ShellUtil::CreateChromeDesktopShortcut(chrome_exe,
     dist->GetAppDescription(), ShellUtil::CURRENT_USER,
-    true); // create if doesnt exist
+    false, true); // create if doesn't exist.
 }
 
 bool FirstRun::CreateChromeQuickLaunchShortcut() {
@@ -178,8 +178,8 @@ bool FirstRun::CreateChromeQuickLaunchShortcut() {
   if (!PathService::Get(base::FILE_EXE, &chrome_exe))
     return false;
   return ShellUtil::CreateChromeQuickLaunchShortcut(chrome_exe,
-    ShellUtil::CURRENT_USER, // create only for current user
-    true); // create if doesnt exist
+    ShellUtil::CURRENT_USER, // create only for current user.
+    true); // create if doesn't exist.
 }
 
 bool FirstRun::RemoveSentinel() {