Refactor of BrowserDistribution.

chrome/installer/util/chrome_frame_distribution.h

Index: chrome/installer/util/chrome_frame_distribution.h
diff --git a/chrome/installer/util/chrome_frame_distribution.h b/chrome/installer/util/chrome_frame_distribution.h
index ff49036b039299186481b858ffc260774c3d0855..6a6cf5b94b478d71d3a7123f2f10c66580ad44d9 100644
--- a/chrome/installer/util/chrome_frame_distribution.h
+++ b/chrome/installer/util/chrome_frame_distribution.h
@@ -15,11 +15,11 @@ class ChromeFrameDistribution : public BrowserDistribution {
  public:
   virtual string16 GetAppGuid() OVERRIDE;
 
-  virtual string16 GetBaseAppName() OVERRIDE;
+  virtual string16 GetShortcutName(ShortcutEnum shortcut_enum) OVERRIDE;
 
-  virtual string16 GetAppShortCutName() OVERRIDE;
+  virtual int GetIconIndex(ShortcutEnum shortcut_enum) OVERRIDE;
 
-  virtual string16 GetAlternateApplicationName() OVERRIDE;
+  virtual string16 GetBaseAppName() OVERRIDE;
 
   virtual string16 GetInstallSubDir() OVERRIDE;
 
@@ -45,10 +45,6 @@ class ChromeFrameDistribution : public BrowserDistribution {
 
   virtual string16 GetVersionKey() OVERRIDE;
 
-  virtual string16 GetIconFilename() OVERRIDE;
-
-  virtual int GetIconIndex() OVERRIDE;
-
   virtual bool CanSetAsDefault() OVERRIDE;
 
   virtual bool CanCreateDesktopShortcuts() OVERRIDE;
@@ -63,6 +59,8 @@ class ChromeFrameDistribution : public BrowserDistribution {
  protected:
   friend class BrowserDistribution;
 
+  virtual string16 GetIconFilename() OVERRIDE;

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

Why is this down here?

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

Done.

+
   // Disallow construction from non-friends.
   ChromeFrameDistribution();
 };