Refactor of BrowserDistribution.

chrome/installer/util/shell_util.h

Index: chrome/installer/util/shell_util.h
diff --git a/chrome/installer/util/shell_util.h b/chrome/installer/util/shell_util.h
index 5977023f832ab7d1276caabae872d61d662614a4..77be4453ceeff7549317f654a9b7e5754a43551e 100644
--- a/chrome/installer/util/shell_util.h
+++ b/chrome/installer/util/shell_util.h
@@ -18,6 +18,7 @@
 #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;
@@ -330,7 +331,9 @@ class ShellUtil {
 
   // 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.