Fix GetAppShortcutName to return a localized name for Chrome

chrome/installer/util/chromium_binaries_distribution.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

[grt (UTC plus 2), 2012/04/27 18:23:07]

2011 -> 2012

[gab, 2012/04/27 20:58:45]

Done.

 // 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"
 
 namespace {
 
 const wchar_t kChromiumBinariesName[] = L"Chromium Binaries";
 
 }  // namespace
 
 ChromiumBinariesDistribution::ChromiumBinariesDistribution()
     : BrowserDistribution(CHROME_BINARIES),
       browser_distribution_(
           BrowserDistribution::GetSpecificDistribution(CHROME_BROWSER)) {
 }
 
-std::wstring ChromiumBinariesDistribution::GetAppGuid() {
-  return std::wstring();
+string16 ChromiumBinariesDistribution::GetAppGuid() {
+  return string16();
 }
 
-std::wstring ChromiumBinariesDistribution::GetApplicationName() {
+string16 ChromiumBinariesDistribution::GetApplicationName() {
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
-std::wstring ChromiumBinariesDistribution::GetAppShortCutName() {
+string16 ChromiumBinariesDistribution::GetAppShortCutName() {
   return kChromiumBinariesName;
 }
 
-std::wstring ChromiumBinariesDistribution::GetAlternateApplicationName() {
+string16 ChromiumBinariesDistribution::GetAlternateApplicationName() {
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
-std::wstring ChromiumBinariesDistribution::GetBrowserAppId() {
+string16 ChromiumBinariesDistribution::GetBrowserAppId() {
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
-std::wstring ChromiumBinariesDistribution::GetInstallSubDir() {
+string16 ChromiumBinariesDistribution::GetInstallSubDir() {
   return browser_distribution_->GetInstallSubDir();
 }
 
-std::wstring ChromiumBinariesDistribution::GetPublisherName() {
+string16 ChromiumBinariesDistribution::GetPublisherName() {
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
-std::wstring ChromiumBinariesDistribution::GetAppDescription() {
+string16 ChromiumBinariesDistribution::GetAppDescription() {
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
-std::wstring ChromiumBinariesDistribution::GetLongAppDescription() {
+string16 ChromiumBinariesDistribution::GetLongAppDescription() {
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
 std::string ChromiumBinariesDistribution::GetSafeBrowsingName() {
   NOTREACHED();
   return std::string();
 }
 
-std::wstring ChromiumBinariesDistribution::GetStateKey() {
-  return std::wstring(L"Software\\").append(kChromiumBinariesName);
+string16 ChromiumBinariesDistribution::GetStateKey() {
+  return string16(L"Software\\").append(kChromiumBinariesName);
 }
 
-std::wstring ChromiumBinariesDistribution::GetStateMediumKey() {
-  return std::wstring(L"Software\\").append(kChromiumBinariesName);
+string16 ChromiumBinariesDistribution::GetStateMediumKey() {
+  return string16(L"Software\\").append(kChromiumBinariesName);
 }
 
-std::wstring ChromiumBinariesDistribution::GetUninstallLinkName() {
+string16 ChromiumBinariesDistribution::GetUninstallLinkName() {
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
-std::wstring ChromiumBinariesDistribution::GetUninstallRegPath() {
+string16 ChromiumBinariesDistribution::GetUninstallRegPath() {
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
-std::wstring ChromiumBinariesDistribution::GetVersionKey() {
-  return std::wstring(L"Software\\").append(kChromiumBinariesName);
+string16 ChromiumBinariesDistribution::GetVersionKey() {
+  return string16(L"Software\\").append(kChromiumBinariesName);
 }
 
 bool ChromiumBinariesDistribution::CanSetAsDefault() {
   NOTREACHED();
   return false;
 }
 
 int ChromiumBinariesDistribution::GetIconIndex() {
   NOTREACHED();
   return 0;
 }
 
-bool ChromiumBinariesDistribution::GetChromeChannel(std::wstring* channel) {
+bool ChromiumBinariesDistribution::GetChromeChannel(string16* channel) {
   NOTREACHED();
   return false;
 }