Change std::wstring to string16 for views::Label and views::Link

chrome/browser/chromeos/login/update_view.cc

 // Copyright (c) 2011 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/chromeos/login/update_view.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/logging.h"
@@ skipping 83 matching lines @@
 
   // Curtain view.
   InitLabel(&checking_label_);
   throbber_ = CreateDefaultThrobber();
   AddChildView(throbber_);
 
 #if !defined(OFFICIAL_BUILD)
   InitLabel(&escape_to_skip_label_);
   escape_to_skip_label_->SetColor(kSkipLabelColor);
   escape_to_skip_label_->SetText(
-      L"Press ESCAPE to skip (Non-official builds only)");
+      ASCIIToUTF16("Press ESCAPE to skip (Non-official builds only)"));
 #endif
 
   UpdateLocalizedStrings();
   UpdateVisibility();
 }
 
 void UpdateView::Reset() {
   progress_bar_->SetValue(0.0);
 }
 
 void UpdateView::UpdateLocalizedStrings() {
-  installing_updates_label_->SetText(UTF16ToWide(l10n_util::GetStringFUTF16(
+  installing_updates_label_->SetText(l10n_util::GetStringFUTF16(
       IDS_INSTALLING_UPDATE,
-      l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME))));
+      l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME)));
   preparing_updates_label_->SetText(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_UPDATE_AVAILABLE)));
+      l10n_util::GetStringUTF16(IDS_UPDATE_AVAILABLE));
   reboot_label_->SetText(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_INSTALLING_UPDATE_DESC)));
+      l10n_util::GetStringUTF16(IDS_INSTALLING_UPDATE_DESC));
   manual_reboot_label_->SetText(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_UPDATE_COMPLETED)));
+      l10n_util::GetStringUTF16(IDS_UPDATE_COMPLETED));
   checking_label_->SetText(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_CHECKING_FOR_UPDATES)));
+      l10n_util::GetStringUTF16(IDS_CHECKING_FOR_UPDATES));
 }
 
 void UpdateView::AddProgress(int ticks) {
   progress_bar_->SetValue(
       max(progress_bar_->current_value() + ticks, 100.0));
 }
 
 void UpdateView::SetProgress(int progress) {
   progress_bar_->SetValue(progress);
 }
@@ skipping 116 matching lines @@
   } else if (manual_reboot_label_->IsVisible()) {
     label_spoken = manual_reboot_label_;
   } else if (preparing_updates_label_->IsVisible()) {
     label_spoken = preparing_updates_label_;
   } else if (installing_updates_label_->IsVisible()) {
     label_spoken = installing_updates_label_;
   } else {
     NOTREACHED();
   }
   const std::string text =
-      label_spoken ? WideToUTF8(label_spoken->GetText()) : std::string();
+      label_spoken ? UTF16ToUTF8(label_spoken->GetText()) : std::string();
   WizardAccessibilityHelper::GetInstance()->MaybeSpeak(text.c_str(), false,
                                                        true);
 }
 
 }  // namespace chromeos