Refactor of BrowserDistribution.

chrome/installer/util/shell_util.h

 // 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 declares methods that are useful for integrating Chrome in
 // Windows shell. These methods are all static and currently part of
 // ShellUtil class.
 
 #ifndef CHROME_INSTALLER_UTIL_SHELL_UTIL_H_
 #define CHROME_INSTALLER_UTIL_SHELL_UTIL_H_
 
 #include <windows.h>
 
 #include <map>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/string16.h"
+#include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/work_item_list.h"
 
 class BrowserDistribution;
 
 // This is a utility class that provides common shell integration methods
 // that can be used by installer as well as Chrome.
 class ShellUtil {
  public:
   // Input to any methods that make changes to OS shell.
   enum ShellChange {
@@ skipping 292 matching lines @@
   // |location| may be one of SHORTCUT_LOCATION_DESKTOP,
   // SHORTCUT_LOCATION_QUICK_LAUNCH, or SHORTCUT_LOCATION_START_MENU.
   static bool CreateOrUpdateShortcut(
       ShellUtil::ShortcutLocation location,
       BrowserDistribution* dist,
       const ShellUtil::ShortcutProperties& properties,
       ShellUtil::ShortcutOperation operation);
 
   // Returns the string "|icon_path|,|icon_index|" (see, for example,
   // http://msdn.microsoft.com/library/windows/desktop/dd391573.aspx).
-  static string16 FormatIconLocation(const string16& icon_path, int icon_index);

[gab, 2013/06/18 19:50:29]

I prefer to keep the old signature here; all callers already have a distribution
and it's more explicit for them to just get the icon index then to have to pass
the distribution and shortcut_enum to this method to let it do part of the work.

[calamity, 2013/06/27 01:27:44]

Done.

+  static string16 FormatIconLocation(
+      const string16& icon_path,
+      BrowserDistribution::ShortcutEnum shortcut_enum);

[gab, 2013/06/18 19:50:29]

All callers have a BrowserDistribution already, pass it in as a parameter
instead of rederiving it.

This is voided by my other comment which prefers to keep the old signature
though... 

 
   // This method returns the command to open URLs/files using chrome. Typically
   // this command is written to the registry under shell\open\command key.
   // |chrome_exe|: the full path to chrome.exe
   static string16 GetChromeShellOpenCmd(const string16& chrome_exe);
 
   // This method returns the command to be called by the DelegateExecute verb
   // handler to launch chrome on Windows 8. Typically this command is written to
   // the registry under the HKCR\Chrome\.exe\shell\(open|run)\command key.
   // |chrome_exe|: the full path to chrome.exe
@@ skipping 221 matching lines @@
   // required by the base32 standard for inputs that aren't a multiple of 5
   // bytes.
   static string16 ByteArrayToBase32(const uint8* bytes, size_t size);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellUtil);
 };
 
 
 #endif  // CHROME_INSTALLER_UTIL_SHELL_UTIL_H_