diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-17 00:09:50 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-17 00:09:50 +0000 |
| commit | bf94d1a4cee4be0648778022f27100f8a074e34a (patch) | |
| tree | bc9c5a831207e06e5cbd179eafc9ffa2ea791589 /chrome/browser/ui/views/about_chrome_view.cc | |
| parent | e31134ff5c4b5889af71cc58b294d1935fd48322 (diff) | |
| download | chromium_src-bf94d1a4cee4be0648778022f27100f8a074e34a.zip chromium_src-bf94d1a4cee4be0648778022f27100f8a074e34a.tar.gz chromium_src-bf94d1a4cee4be0648778022f27100f8a074e34a.tar.bz2 | |
base/version: remove wstring version
And fix callers.
BUG=23581
TEST=trybots
Review URL: http://codereview.chromium.org/5848005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/about_chrome_view.cc')
| -rw-r--r-- | chrome/browser/ui/views/about_chrome_view.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc index 9e58f04..215c6f0 100644 --- a/chrome/browser/ui/views/about_chrome_view.cc +++ b/chrome/browser/ui/views/about_chrome_view.cc @@ -156,16 +156,16 @@ void AboutChromeView::Init() { return; } - current_version_ = ASCIIToWide(version_info.Version()); + current_version_ = version_info.Version(); std::string version_modifier = platform_util::GetVersionStringModifier(); if (!version_modifier.empty()) - version_details_ += L" " + ASCIIToWide(version_modifier); + version_details_ += " " + version_modifier; #if !defined(GOOGLE_CHROME_BUILD) - version_details_ += L" ("; - version_details_ += ASCIIToWide(version_info.LastChange()); - version_details_ += L")"; + version_details_ += " ("; + version_details_ += version_info.LastChange(); + version_details_ += ")"; #endif // Views we will add to the *parent* of this dialog, since it will display @@ -210,7 +210,7 @@ void AboutChromeView::Init() { // This is a text field so people can copy the version number from the dialog. version_label_ = new views::Textfield(); - version_label_->SetText(WideToUTF16Hack(current_version_ + version_details_)); + version_label_->SetText(ASCIIToUTF16(current_version_ + version_details_)); version_label_->SetReadOnly(true); version_label_->RemoveBorder(); version_label_->SetTextColor(SK_ColorBLACK); @@ -763,7 +763,7 @@ void AboutChromeView::UpdateStatus(GoogleUpdateUpgradeResult result, std::wstring update_label_text = l10n_util::GetStringF(IDS_UPGRADE_ALREADY_UP_TO_DATE, l10n_util::GetString(IDS_PRODUCT_NAME), - current_version_); + ASCIIToUTF16(current_version_)); #endif if (base::i18n::IsRTL()) { update_label_text.push_back( |