Installer string cleaning following Chrome Frame removal.

chrome/installer/util/chrome_frame_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 defines a specific implementation of BrowserDistribution class for
 // Chrome Frame. It overrides the bare minimum of methods necessary to get a
 // Chrome Frame installer that does not interact with Google Chrome or
 // Chromium installations.
 
 #include "chrome/installer/util/chrome_frame_distribution.h"
@@ skipping 28 matching lines @@
 base::string16 ChromeFrameDistribution::GetBrowserProgIdPrefix() {
   NOTREACHED();
   return base::string16();
 }
 
 base::string16 ChromeFrameDistribution::GetBrowserProgIdDesc() {
   NOTREACHED();
   return base::string16();
 }
 
+base::string16 ChromeFrameDistribution::GetDisplayName() {
+#if defined(GOOGLE_CHROME_BUILD)
+  return L"Google Chrome Frame";
+#else
+  return L"Chromium Frame";
+#endif
+}
+
 base::string16 ChromeFrameDistribution::GetShortcutName(
     ShortcutType shortcut_type) {
-  switch (shortcut_type) {
-    case SHORTCUT_CHROME:
-    case SHORTCUT_CHROME_ALTERNATE:
-      return installer::GetLocalizedString(IDS_PRODUCT_FRAME_NAME_BASE);
-    default:
-      NOTREACHED();
-      return base::string16();
-  }
+  NOTREACHED();
+  return base::string16();
 }
 
 base::string16 ChromeFrameDistribution::GetInstallSubDir() {
   return L"Google\\Chrome Frame";
 }
 
 base::string16 ChromeFrameDistribution::GetPublisherName() {
   const base::string16& publisher_name =
       installer::GetLocalizedString(IDS_ABOUT_VERSION_COMPANY_NAME_BASE);
   return publisher_name;
@@ skipping 79 matching lines @@
 
 void ChromeFrameDistribution::UpdateInstallStatus(bool system_install,
     installer::ArchiveType archive_type,
     installer::InstallStatus install_status) {
 #if defined(GOOGLE_CHROME_BUILD)
   GoogleUpdateSettings::UpdateInstallStatus(system_install,
       archive_type, InstallUtil::GetInstallReturnCode(install_status),
       kChromeFrameGuid);
 #endif
 }