Refactor of BrowserDistribution.

chrome/installer/util/chromium_binaries_distribution.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.
 //
 // This file declares a class that contains various method related to branding.
 
 #include "chrome/installer/util/google_chrome_binaries_distribution.h"
 
 #include "base/logging.h"
 
@@ skipping 11 matching lines @@
 
 string16 ChromiumBinariesDistribution::GetAppGuid() {
   return string16();
 }
 
 string16 ChromiumBinariesDistribution::GetBaseAppName() {
   NOTREACHED();
   return string16();
 }
 
-string16 ChromiumBinariesDistribution::GetAppShortCutName() {
-  return kChromiumBinariesName;
-}
-
-string16 ChromiumBinariesDistribution::GetAlternateApplicationName() {
-  NOTREACHED();
-  return string16();
+BrowserDistribution::ShortcutInfo ChromiumBinariesDistribution::GetShortcutInfo(

[gab, 2013/05/24 15:01:35]

The binaries shouldn't need GetShortcutInfo; if this is only required for
GetDisplayName(), I say make GetShortcutInfo NOTREACHED() as the other methods
and override GetDisplayName() to return kChromiumBinariesName.

[calamity, 2013/05/31 00:11:18]

Done.

+    ShortcutEnum shortcut_enum) {
+  ShortcutInfo info;
+  switch (shortcut_enum) {
+    case SHORTCUT_CHROME:
+      info.name = kChromiumBinariesName;
+      info.icon_index = 0;
+      break;
+    default:
+      NOTREACHED();
+      return ShortcutInfo();
+  }
+  return info;
 }
 
 string16 ChromiumBinariesDistribution::GetBaseAppId() {
   NOTREACHED();
   return string16();
 }
 
 string16 ChromiumBinariesDistribution::GetInstallSubDir() {
   return browser_distribution_->GetInstallSubDir();
 }
@@ skipping 37 matching lines @@
 }
 
 string16 ChromiumBinariesDistribution::GetVersionKey() {
   return string16(L"Software\\").append(kChromiumBinariesName);
 }
 
 bool ChromiumBinariesDistribution::CanSetAsDefault() {
   return false;
 }
 
-int ChromiumBinariesDistribution::GetIconIndex() {
-  NOTREACHED();
-  return 0;
-}
-
 bool ChromiumBinariesDistribution::GetChromeChannel(string16* channel) {
   NOTREACHED();
   return false;
 }
 
 bool ChromiumBinariesDistribution::GetCommandExecuteImplClsid(
     string16* handler_class_uuid) {
   return false;
 }