Refactor of BrowserDistribution.

This is a precursor to https://codereview.chromium.org/13864015/.

* Added GetStartMenuShortcutSubfolder, which returns the Start Menu
  subfolder path for a given subfolder.

* GetShortcutName and GetIconIndex now return data specific to a type
  of shortcut (browser, alternate name of browser, or app launcher).

* GetDisplayName is now used rather than GetAppShortcutName where a
  localized name is needed (e.g., in logs and the registry).

BUG=233434,238895,161985

Review URL: https://chromiumcodereview.appspot.com/15255004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217469 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/chrome/installer/setup/setup_util.cc b/chrome/installer/setup/setup_util.cc
index 3de04fb..8ecdcb6d 100644
--- a/chrome/installer/setup/setup_util.cc
+++ b/chrome/installer/setup/setup_util.cc
@@ -394,7 +394,7 @@ void MigrateGoogleUpdateStateMultiToSingle(
                             KEY_SET_VALUE);
     if (result != ERROR_SUCCESS) {
       LOG(ERROR) << "Failed opening ClientState key for "
-                 << dist->GetAppShortCutName() << " to migrate usagestats.";
+                 << dist->GetDisplayName() << " to migrate usagestats.";
     } else {
       state_key.WriteValue(google_update::kRegUsageStatsField, usagestats);
     }
@@ -416,7 +416,7 @@ void MigrateGoogleUpdateStateMultiToSingle(
       if (result == ERROR_SUCCESS &&
           channel_info.Initialize(state_key) &&
           product_to_migrate.SetChannelFlags(false, &channel_info)) {
-        VLOG(1) << "Moving " << dist->GetAppShortCutName()
+        VLOG(1) << "Moving " << dist->GetDisplayName()
                 << " to channel: " << channel_info.value();
         channel_info.Write(&state_key);
       }
@@ -431,10 +431,10 @@ void MigrateGoogleUpdateStateMultiToSingle(
   if (result == ERROR_SUCCESS) {
     installer::ChannelInfo channel_info;
     if (!channel_info.Initialize(state_key)) {
-      LOG(ERROR) << "Failed reading " << dist->GetAppShortCutName()
+      LOG(ERROR) << "Failed reading " << dist->GetDisplayName()
                  << " channel info.";
     } else if (channel_info.RemoveAllModifiersAndSuffixes()) {
-      VLOG(1) << "Moving " << dist->GetAppShortCutName()
+      VLOG(1) << "Moving " << dist->GetDisplayName()
               << " to channel: " << channel_info.value();
       channel_info.Write(&state_key);
     }