Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Unified Diff: chrome/browser/ui/views/about_chrome_view.cc

Issue 5848005: base/version: remove wstring version (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: retry Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/about_chrome_view.h ('k') | chrome/browser/upgrade_detector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/about_chrome_view.cc
diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc
index 9e58f042dda994931b81f7b6877846d2add58233..215c6f07f6ac8747287a1ad8f22c4c5b41514589 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(
« no previous file with comments | « chrome/browser/ui/views/about_chrome_view.h ('k') | chrome/browser/upgrade_detector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698