Refactor of BrowserDistribution.

chrome/browser/shell_integration_win.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.
 
 #include "chrome/browser/shell_integration.h"
 
 #include <windows.h>
 #include <shobjidl.h>
 #include <propkey.h>
 
@@ skipping 339 matching lines @@
            dist, InstallUtil::IsPerUserInstall(chrome_exe.value().c_str())),
       profile_path);
 }
 
 string16 ShellIntegration::GetAppListAppModelIdForProfile(
     const base::FilePath& profile_path) {
   return ShellIntegration::GetAppModelIdForProfile(
       GetAppListAppName(), profile_path);
 }
 
 string16 ShellIntegration::GetChromiumIconLocation() {

[gab, 2013/05/18 23:57:22]

Looks like this method is no longer used.

[calamity, 2013/05/24 02:03:11]

Removed.

   // Determine the path to chrome.exe. If we can't determine what that is,
   // we have bigger fish to fry...
   base::FilePath chrome_exe;
   if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
     NOTREACHED();
     return string16();
   }
 
   return ShellUtil::FormatIconLocation(
       chrome_exe.value(),
-      BrowserDistribution::GetDistribution()->GetIconIndex());
+      BrowserDistribution::GetDistribution()->
+          GetShortcutInfo(BrowserDistribution::SHORTCUT_CHROME).icon_index);
 }
 
 void ShellIntegration::MigrateChromiumShortcuts() {
   if (base::win::GetVersion() < base::win::VERSION_WIN7)
     return;
 
   // This needs to happen eventually (e.g. so that the appid is fixed and the
   // run-time Chrome icon is merged with the taskbar shortcut), but this is not
   // urgent and shouldn't delay Chrome startup.
   static const int64 kMigrateChromiumShortcutsDelaySeconds = 15;
@@ skipping 122 matching lines @@
   return shortcuts_migrated;
 }
 
 base::FilePath ShellIntegration::GetStartMenuShortcut(
     const base::FilePath& chrome_exe) {
   static const int kFolderIds[] = {
     base::DIR_COMMON_START_MENU,
     base::DIR_START_MENU,
   };
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  string16 shortcut_name(dist->GetAppShortCutName());
+  string16 shortcut_name(
+      dist->GetShortcutInfo(BrowserDistribution::SHORTCUT_CHROME).name);
   base::FilePath shortcut;
 
   // Check both the common and the per-user Start Menu folders for system-level
   // installs.
   size_t folder =
       InstallUtil::IsPerUserInstall(chrome_exe.value().c_str()) ? 1 : 0;
   for (; folder < arraysize(kFolderIds); ++folder) {
     if (!PathService::Get(kFolderIds[folder], &shortcut)) {
       NOTREACHED();
       continue;
     }
 
     shortcut = shortcut.Append(shortcut_name).Append(shortcut_name +
                                                      installer::kLnkExt);
     if (file_util::PathExists(shortcut))
       return shortcut;
   }
 
   return base::FilePath();
 }