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

chrome/browser/first_run/first_run_win.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.
 
 #include "chrome/browser/first_run/first_run.h"
 
 #include <shellapi.h>
 #include <shlobj.h>
 #include <windows.h>
 
@@ skipping 93 matching lines @@
 
 // Creates the desktop shortcut to chrome for the current user. Returns
 // false if it fails. It will overwrite the shortcut if it exists.
 bool CreateChromeDesktopShortcut() {
   FilePath chrome_exe;
   if (!PathService::Get(base::FILE_EXE, &chrome_exe))
     return false;
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   if (!dist || !dist->CanCreateDesktopShortcuts())
     return false;
-  return ShellUtil::CreateChromeDesktopShortcut(
-      dist,
-      chrome_exe.value(),
-      dist->GetAppDescription(),
-      L"",
-      L"",
-      chrome_exe.value(),
-      dist->GetIconIndex(),
-      ShellUtil::CURRENT_USER,
-      ShellUtil::SHORTCUT_CREATE_ALWAYS);
+  ShellUtil::ChromeShortcutProperties properties(ShellUtil::CURRENT_USER);

[robertshield, 2012/10/04 00:25:23]

nit: vague preference for shortcut_properties over properties here and below.

[gab, 2012/10/04 04:10:32]

Sure, although this makes the definition take 2 lines...

+  properties.set_chrome_exe(chrome_exe);
+  return ShellUtil::CreateOrUpdateChromeShortcut(
+      ShellUtil::SHORTCUT_DESKTOP, dist, properties,
+      ShellUtil::SHORTCUT_CREATE_IF_NO_SYSTEM_LEVEL);
 }
 
 // Creates the quick launch shortcut to chrome for the current user. Returns
 // false if it fails. It will overwrite the shortcut if it exists.
 bool CreateChromeQuickLaunchShortcut() {
   FilePath chrome_exe;
   if (!PathService::Get(base::FILE_EXE, &chrome_exe))
     return false;
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  return ShellUtil::CreateChromeQuickLaunchShortcut(
-      dist,
-      chrome_exe.value(),
-      ShellUtil::CURRENT_USER,  // create only for current user.
-      ShellUtil::SHORTCUT_CREATE_ALWAYS);
+  ShellUtil::ChromeShortcutProperties properties(ShellUtil::CURRENT_USER);
+  properties.set_chrome_exe(chrome_exe);
+  return ShellUtil::CreateOrUpdateChromeShortcut(
+      ShellUtil::SHORTCUT_QUICK_LAUNCH, dist, properties,
+      ShellUtil::SHORTCUT_CREATE_IF_NO_SYSTEM_LEVEL);
 }
 
 void PlatformSetup(Profile* profile) {
   CreateChromeDesktopShortcut();
 
   // Windows 7 has deprecated the quick launch bar.
   if (base::win::GetVersion() < base::win::VERSION_WIN7)
     CreateChromeQuickLaunchShortcut();
 }
 
@@ skipping 498 matching lines @@
     return SKIP_FIRST_RUN;
 
   internal::SetShowWelcomePagePrefIfNeeded(install_prefs.get());
   internal::SetImportPreferencesAndLaunchImport(out_prefs, install_prefs.get());
   internal::SetDefaultBrowser(install_prefs.get());
 
   return SKIP_FIRST_RUN;
 }
 
 }  // namespace first_run