Refactor of BrowserDistribution.

chrome/installer/util/browser_distribution.h

Index: chrome/installer/util/browser_distribution.h
diff --git a/chrome/installer/util/browser_distribution.h b/chrome/installer/util/browser_distribution.h
index ca67c0bc1b5d40d7b382c0dd8280cb43a92276b0..94cbe99c10381a0c9d2d0a8e69b62f9d1a9a1b76 100644
--- a/chrome/installer/util/browser_distribution.h
+++ b/chrome/installer/util/browser_distribution.h
@@ -29,6 +29,17 @@ class BrowserDistribution {
     NUM_TYPES
   };
 
+  enum ShortcutEnum {

[grt (UTC plus 2), 2013/06/28 04:35:21]

i don't think the suffix "Enum" is idiomatic. please remove it. name the type
for what it represents, not what it is (i.e., you wouldn't change
BrowserDistribution to BrowserDistributionClass).

[calamity, 2013/07/05 09:00:29]

I think this name was suggested offhand in another review. Fixed.

+    SHORTCUT_CHROME,
+    SHORTCUT_ALTERNATE_CHROME,
+    SHORTCUT_APP_LAUNCHER
+  };
+
+  enum SubfolderEnum {
+    SUBFOLDER_CHROME,
+    // TODO(calamity): add SUBFOLDER_APPS when refactoring chrome app dir code.
+  };
+
   virtual ~BrowserDistribution() {}
 
   static BrowserDistribution* GetDistribution();
@@ -53,10 +64,19 @@ class BrowserDistribution {
   // at run-time.
   virtual string16 GetBaseAppName();
 
-  // Returns the localized name of the program.
-  virtual string16 GetAppShortCutName();
+  // Returns the display name of this distribution.
+  virtual string16 GetDisplayName();
 
-  virtual string16 GetAlternateApplicationName();
+  virtual string16 GetShortcutName(ShortcutEnum shortcut_enum);

[gab, 2013/06/27 11:49:43]

Add a comment to this method too, e.g.:

// Returns the name of the shortcut identified by |shortcut_enum| for this
// distribution.

[grt (UTC plus 2), 2013/06/28 04:35:21]

please remove _enum here and elsewhere

[calamity, 2013/07/05 09:00:29]

Done.

+  // Returns the index of the icon for the product, inside the file specified by
+  // GetIconFilename().

[gab, 2013/06/27 11:49:43]

Mention what is |shortcut_enum| in this comment (ref. comment proposition
above).

[calamity, 2013/07/05 09:00:29]

Done.

+  virtual int GetIconIndex(ShortcutEnum shortcut_enum);
+  // Returns the executable filename (not path) that contains the product icon.
+  virtual string16 GetIconFilename();
+
+  // Returns the name of the subfolder in the Start Menu that this distribution
+  // should create shortcuts in.

[gab, 2013/06/27 11:49:43]

Mention what is |subfolder_enum| in this comment.

[calamity, 2013/07/05 09:00:29]

Done.

+  virtual string16 GetStartMenuShortcutSubfolder(SubfolderEnum subfolder_enum);
 
   // Returns the unsuffixed appid of this program.
   // The AppUserModelId is a property of Windows programs.
@@ -96,13 +116,6 @@ class BrowserDistribution {
 
   virtual bool CanCreateDesktopShortcuts();
 
-  // Returns the executable filename (not path) that contains the product icon.
-  virtual string16 GetIconFilename();
-
-  // Returns the index of the icon for the product, inside the file specified by
-  // GetIconFilename().
-  virtual int GetIconIndex();
-
   virtual bool GetChromeChannel(string16* channel);
 
   // Returns true if this distribution includes a DelegateExecute verb handler,