Fix GetAppShortcutName to return a localized name for Chrome

chrome/installer/util/browser_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 class that contains various method related to branding.
 // It provides only default implementations of these methods. Usually to add
 // specific branding, we will need to extend this class with a custom
 // implementation.
 
 #include "chrome/installer/util/browser_distribution.h"
@@ skipping 114 matching lines @@
       dist = GetOrCreateBrowserDistribution<ChromiumBinariesDistribution>(
           &g_binaries_distribution);
 #endif
   }
 
   return dist;
 }
 
 void BrowserDistribution::DoPostUninstallOperations(
     const Version& version, const FilePath& local_data_path,
-    const std::wstring& distribution_data) {
+    const string16& distribution_data) {
 }
 
-std::wstring BrowserDistribution::GetAppGuid() {
+string16 BrowserDistribution::GetAppGuid() {
   return L"";
 }
 
-std::wstring BrowserDistribution::GetApplicationName() {
+string16 BrowserDistribution::GetApplicationName() {
   return L"Chromium";
 }
 
-std::wstring BrowserDistribution::GetAppShortCutName() {
+string16 BrowserDistribution::GetAppShortCutName() {
   return GetApplicationName();
 }
 
-std::wstring BrowserDistribution::GetAlternateApplicationName() {
+string16 BrowserDistribution::GetAlternateApplicationName() {
   return L"The Internet";
 }
 
-std::wstring BrowserDistribution::GetBrowserAppId() {
+string16 BrowserDistribution::GetBrowserAppId() {
   return L"Chromium";
 }
 
-std::wstring BrowserDistribution::GetInstallSubDir() {
+string16 BrowserDistribution::GetInstallSubDir() {
   return L"Chromium";
 }
 
-std::wstring BrowserDistribution::GetPublisherName() {
+string16 BrowserDistribution::GetPublisherName() {
   return L"Chromium";
 }
 
-std::wstring BrowserDistribution::GetAppDescription() {
+string16 BrowserDistribution::GetAppDescription() {
   return L"Browse the web";
 }
 
-std::wstring BrowserDistribution::GetLongAppDescription() {
-  const std::wstring& app_description =
+string16 BrowserDistribution::GetLongAppDescription() {
+  const string16& app_description =
       installer::GetLocalizedString(IDS_PRODUCT_DESCRIPTION_BASE);
   return app_description;
 }
 
 std::string BrowserDistribution::GetSafeBrowsingName() {
   return "chromium";
 }
 
-std::wstring BrowserDistribution::GetStateKey() {
+string16 BrowserDistribution::GetStateKey() {
   return L"Software\\Chromium";
 }
 
-std::wstring BrowserDistribution::GetStateMediumKey() {
+string16 BrowserDistribution::GetStateMediumKey() {
   return L"Software\\Chromium";
 }
 
-std::wstring BrowserDistribution::GetStatsServerURL() {
+string16 BrowserDistribution::GetStatsServerURL() {
   return L"";
 }
 
 std::string BrowserDistribution::GetNetworkStatsServer() const {
   return "";
 }
 
 std::string BrowserDistribution::GetHttpPipeliningTestServer() const {
   return "";
 }
 
-std::wstring BrowserDistribution::GetDistributionData(HKEY root_key) {
+string16 BrowserDistribution::GetDistributionData(HKEY root_key) {
   return L"";
 }
 
-std::wstring BrowserDistribution::GetUninstallLinkName() {
+string16 BrowserDistribution::GetUninstallLinkName() {
   return L"Uninstall Chromium";
 }
 
-std::wstring BrowserDistribution::GetUninstallRegPath() {
+string16 BrowserDistribution::GetUninstallRegPath() {
   return L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Chromium";
 }
 
-std::wstring BrowserDistribution::GetVersionKey() {
+string16 BrowserDistribution::GetVersionKey() {
   return L"Software\\Chromium";
 }
 
 bool BrowserDistribution::CanSetAsDefault() {
   return true;
 }
 
 bool BrowserDistribution::CanCreateDesktopShortcuts() {
   return true;
 }
 
 int BrowserDistribution::GetIconIndex() {
   return 0;
 }
 
-bool BrowserDistribution::GetChromeChannel(std::wstring* channel) {
+bool BrowserDistribution::GetChromeChannel(string16* channel) {
   return false;
 }
 
 bool BrowserDistribution::GetDelegateExecuteHandlerData(
     string16* handler_class_uuid,
     string16* type_lib_uuid,
     string16* type_lib_version,
     string16* interface_uuid) {
   // TODO(grt): http://crbug.com/123727 Return values for Chromium.
   return false;
@@ skipping 10 matching lines @@
 }
 
 void BrowserDistribution::LaunchUserExperiment(
     const FilePath& setup_path, installer::InstallStatus status,
     const Version& version, const installer::Product& product,
     bool system_level) {
 }
 
 
 void BrowserDistribution::InactiveUserToastExperiment(int flavor,
-    const std::wstring& experiment_group,
+    const string16& experiment_group,
     const installer::Product& installation,
     const FilePath& application_path) {
 }