base/version: remove wstring version

chrome/browser/ui/views/about_chrome_view.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/views/about_chrome_view.h"
 
 #if defined(OS_WIN)
 #include <commdlg.h>
 #endif  // defined(OS_WIN)
 
@@ skipping 138 matching lines @@
 void AboutChromeView::Init() {
   text_direction_is_rtl_ = base::i18n::IsRTL();
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   chrome::VersionInfo version_info;
   if (!version_info.is_valid()) {
     NOTREACHED() << L"Failed to initialize about window";
     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
   // next to the buttons which we don't draw ourselves.
   throbber_.reset(new views::Throbber(50, true));
   throbber_->set_parent_owned(false);
   throbber_->SetVisible(false);
 
   SkBitmap* success_image = rb.GetBitmapNamed(IDR_UPDATE_UPTODATE);
   success_indicator_.SetImage(*success_image);
@@ skipping 24 matching lines @@
   // Add the dialog labels.
   about_title_label_ = new views::Label(
       l10n_util::GetString(IDS_PRODUCT_NAME));
   about_title_label_->SetFont(ResourceBundle::GetSharedInstance().GetFont(
       ResourceBundle::BaseFont).DeriveFont(18));
   about_title_label_->SetColor(SK_ColorBLACK);
   AddChildView(about_title_label_);
 
   // 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);
   version_label_->SetBackgroundColor(SK_ColorWHITE);
   version_label_->SetFont(ResourceBundle::GetSharedInstance().GetFont(
       ResourceBundle::BaseFont));
   AddChildView(version_label_);
 
 #if defined(OS_CHROMEOS)
   os_version_label_ = new views::Textfield(views::Textfield::STYLE_MULTILINE);
@@ skipping 519 matching lines @@
       // staged then UPGRADE_SUCESSFUL will be returned.
 #if defined(OS_WIN)
       // Google Update reported that Chrome is up-to-date. Now make sure that we
       // are running the latest version and if not, notify the user by falling
       // into the next case of UPGRADE_SUCCESSFUL.
       // TODO(tommi): Check if using the default distribution is always the
       // right thing to do.
       BrowserDistribution* dist = BrowserDistribution::GetDistribution();
       scoped_ptr<installer::Version> installed_version(
           InstallUtil::GetChromeVersion(dist, false));
+      std::wstring version_wide = ASCIIToUTF16(current_version_);
       scoped_ptr<installer::Version> running_version(
-          installer::Version::GetVersionFromString(current_version_));
+          installer::Version::GetVersionFromString(version_wide));
       if (!installed_version.get() ||
           !installed_version->IsHigherThan(running_version.get())) {
 #endif
         UserMetrics::RecordAction(
             UserMetricsAction("UpgradeCheck_AlreadyUpToDate"), profile_);
 #if defined(OS_CHROMEOS)
         std::wstring update_label_text =
             l10n_util::GetStringF(IDS_UPGRADE_ALREADY_UP_TO_DATE,
                                   l10n_util::GetString(IDS_PRODUCT_NAME));
 #else
         std::wstring update_label_text =
             l10n_util::GetStringF(IDS_UPGRADE_ALREADY_UP_TO_DATE,
                                   l10n_util::GetString(IDS_PRODUCT_NAME),
-                                  current_version_);
+                                  version_wide);
 #endif
         if (base::i18n::IsRTL()) {
           update_label_text.push_back(
               static_cast<wchar_t>(base::i18n::kLeftToRightMark));
         }
         update_label_.SetText(update_label_text);
         show_success_indicator = true;
         break;
 #if defined(OS_WIN)
       }
@@ skipping 41 matching lines @@
   View* parent = GetParent();
   parent->Layout();
 
   // Check button may have appeared/disappeared. We cannot call this during
   // ViewHierarchyChanged because the |window()| pointer hasn't been set yet.
   if (window())
     GetDialogClientView()->UpdateDialogButtons();
 }
 
 #endif