| Index: chrome/installer/util/google_chrome_sxs_distribution.cc
|
| diff --git a/chrome/installer/util/google_chrome_sxs_distribution.cc b/chrome/installer/util/google_chrome_sxs_distribution.cc
|
| index 195ea69ff3a008532c27cc1299e37973119468f5..5e3a8ff2cf9785d75e740d5ba97a3df95c5c0952 100644
|
| --- a/chrome/installer/util/google_chrome_sxs_distribution.cc
|
| +++ b/chrome/installer/util/google_chrome_sxs_distribution.cc
|
| @@ -25,26 +25,26 @@ GoogleChromeSxSDistribution::GoogleChromeSxSDistribution()
|
| GoogleChromeDistribution::set_product_guid(kChromeSxSGuid);
|
| }
|
|
|
| -std::wstring GoogleChromeSxSDistribution::GetApplicationName() {
|
| +string16 GoogleChromeSxSDistribution::GetApplicationName() {
|
| return L"Google Chrome Canary";
|
| }
|
|
|
| -std::wstring GoogleChromeSxSDistribution::GetAppShortCutName() {
|
| - const std::wstring& shortcut_name =
|
| +string16 GoogleChromeSxSDistribution::GetAppShortCutName() {
|
| + const string16& shortcut_name =
|
| installer::GetLocalizedString(IDS_SXS_SHORTCUT_NAME_BASE);
|
| return shortcut_name;
|
| }
|
|
|
| -std::wstring GoogleChromeSxSDistribution::GetBrowserAppId() {
|
| +string16 GoogleChromeSxSDistribution::GetBrowserAppId() {
|
| return kBrowserAppId;
|
| }
|
|
|
| -std::wstring GoogleChromeSxSDistribution::GetInstallSubDir() {
|
| +string16 GoogleChromeSxSDistribution::GetInstallSubDir() {
|
| return GoogleChromeDistribution::GetInstallSubDir().append(
|
| installer::kSxSSuffix);
|
| }
|
|
|
| -std::wstring GoogleChromeSxSDistribution::GetUninstallRegPath() {
|
| +string16 GoogleChromeSxSDistribution::GetUninstallRegPath() {
|
| return GoogleChromeDistribution::GetUninstallRegPath().append(
|
| installer::kSxSSuffix);
|
| }
|
| @@ -57,7 +57,7 @@ int GoogleChromeSxSDistribution::GetIconIndex() {
|
| return kSxSIconIndex;
|
| }
|
|
|
| -bool GoogleChromeSxSDistribution::GetChromeChannel(std::wstring* channel) {
|
| +bool GoogleChromeSxSDistribution::GetChromeChannel(string16* channel) {
|
| *channel = kChannelName;
|
| return true;
|
| }
|
| @@ -70,6 +70,6 @@ bool GoogleChromeSxSDistribution::GetDelegateExecuteHandlerData(
|
| return false;
|
| }
|
|
|
| -std::wstring GoogleChromeSxSDistribution::ChannelName() {
|
| +string16 GoogleChromeSxSDistribution::ChannelName() {
|
| return kChannelName;
|
| }
|
|
|