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

chrome/browser/chromeos/login/eula_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/eula_view.h"
 
 #include <signal.h>
 #include <sys/types.h>
 
 #include <string>
@@ skipping 120 matching lines @@
   eula_view_->OnTpmInfoViewClosed(this);
 }
 
 void TpmInfoView::Init() {
   views::GridLayout* layout = views::GridLayout::CreatePanel(this);
   SetLayoutManager(layout);
   views::ColumnSet* column_set = layout->AddColumnSet(0);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0, 0);
   layout->StartRow(0, 0);
-  views::Label* label = new views::Label(UTF16ToWide(
-      l10n_util::GetStringUTF16(IDS_EULA_SYSTEM_SECURITY_SETTING_DESCRIPTION)));
+  views::Label* label = new views::Label(
+      l10n_util::GetStringUTF16(IDS_EULA_SYSTEM_SECURITY_SETTING_DESCRIPTION));
   label->SetMultiLine(true);
   label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   layout->AddView(label);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, 0);
-  label = new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
-      IDS_EULA_SYSTEM_SECURITY_SETTING_DESCRIPTION_KEY)));
+  label = new views::Label(l10n_util::GetStringUTF16(
+      IDS_EULA_SYSTEM_SECURITY_SETTING_DESCRIPTION_KEY));
   label->SetMultiLine(true);
   label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   layout->AddView(label);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   column_set = layout->AddColumnSet(1);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0, 0);
   layout->StartRow(0, 1);
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   gfx::Font password_font =
       rb.GetFont(ResourceBundle::MediumFont).DeriveFont(0, gfx::Font::BOLD);
   // Password will be set later.
-  password_label_ = new views::Label(L"", password_font);
+  password_label_ = new views::Label(string16(), password_font);
   password_label_->SetVisible(false);
   layout->AddView(password_label_);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   column_set = layout->AddColumnSet(2);
   column_set->AddPaddingColumn(1, 0);
   // Resize of the throbber and label is not allowed, since we want they to be
   // placed in the center.
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 0,
                         views::GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 0,
                         views::GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(1, 0);
   // Border padding columns should have the same width. It guaranties that
   // throbber and label will be placed in the center.
   column_set->LinkColumnSizes(0, 4, -1);
 
   layout->StartRow(0, 2);
   throbber_ = chromeos::CreateDefaultThrobber();
   throbber_->Start();
   layout->AddView(throbber_);
   busy_label_ = new views::Label(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_EULA_TPM_BUSY)));
+      l10n_util::GetStringUTF16(IDS_EULA_TPM_BUSY));
   layout->AddView(busy_label_);
   layout->AddPaddingRow(0, views::kRelatedControlHorizontalSpacing);
 }
 
 void TpmInfoView::ShowTpmPassword(const std::string& tpm_password) {
-  password_label_->SetText(ASCIIToWide(tpm_password));
+  password_label_->SetText(ASCIIToUTF16(tpm_password));
   password_label_->SetVisible(true);
   busy_label_->SetVisible(false);
   throbber_->Stop();
   throbber_->SetVisible(false);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // EULATabContentsDelegate, public:
 
 bool EULATabContentsDelegate::IsPopup(TabContents* source) {
@@ skipping 79 matching lines @@
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
   SetUpGridLayout(layout);
 
   static const int kPadding = kBorderSize + kMargin;
   layout->AddPaddingRow(0, kPadding);
   layout->StartRow(0, SINGLE_CONTROL_ROW);
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   gfx::Font label_font =
       rb.GetFont(ResourceBundle::MediumFont).DeriveFont(0, gfx::Font::NORMAL);
-  google_eula_label_ = new views::Label(std::wstring(), label_font);
+  google_eula_label_ = new views::Label(string16(), label_font);
   layout->AddView(google_eula_label_, 1, 1,
                   views::GridLayout::LEADING, views::GridLayout::FILL);
 
   layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
   layout->StartRow(1, SINGLE_CONTROL_ROW);
   views::View* box_view = new views::View();
   box_view->set_border(views::Border::CreateSolidBorder(1, SK_ColorBLACK));
   box_view->SetLayoutManager(new FillLayoutWithBorder());
   layout->AddView(box_view);
 
   google_eula_view_ = new DOMView();
   box_view->AddChildView(google_eula_view_);
 
   layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
   layout->StartRow(0, SINGLE_CONTROL_WITH_SHIFT_ROW);
   usage_statistics_checkbox_ = new views::Checkbox(L"");
   usage_statistics_checkbox_->SetMultiLine(true);
   usage_statistics_checkbox_->SetChecked(
       actor_->screen()->IsUsageStatsEnabled());
   layout->AddView(usage_statistics_checkbox_);
 
   layout->StartRow(0, SINGLE_LINK_WITH_SHIFT_ROW);
   learn_more_link_ = new views::Link();
   learn_more_link_->set_listener(this);
   layout->AddView(learn_more_link_);
 
   layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
   layout->StartRow(0, SINGLE_CONTROL_ROW);
-  oem_eula_label_ = new views::Label(std::wstring(), label_font);
+  oem_eula_label_ = new views::Label(string16(), label_font);
   layout->AddView(oem_eula_label_, 1, 1,
                   views::GridLayout::LEADING, views::GridLayout::FILL);
 
   oem_eula_page_ = actor_->screen()->GetOemEulaUrl();
   if (!oem_eula_page_.is_empty()) {
     layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
     layout->StartRow(1, SINGLE_CONTROL_ROW);
     box_view = new views::View();
     box_view->SetLayoutManager(new FillLayoutWithBorder());
     box_view->set_border(views::Border::CreateSolidBorder(1, SK_ColorBLACK));
@@ skipping 42 matching lines @@
 
   // Set tooltip for system security settings link if TPM is disabled.
   if (!system_security_settings_link_->IsEnabled()) {
     system_security_settings_link_->SetTooltipText(
         l10n_util::GetStringUTF16(IDS_EULA_TPM_DISABLED));
   }
 
   // Load other labels from resources.
   usage_statistics_checkbox_->SetText(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_EULA_CHECKBOX_ENABLE_LOGGING)));
-  learn_more_link_->SetText(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_LEARN_MORE)));
+  learn_more_link_->SetText(l10n_util::GetStringUTF16(IDS_LEARN_MORE));
   system_security_settings_link_->SetText(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_EULA_SYSTEM_SECURITY_SETTING)));
+      l10n_util::GetStringUTF16(IDS_EULA_SYSTEM_SECURITY_SETTING));
   continue_button_->SetText(UTF16ToWide(
       l10n_util::GetStringUTF16(IDS_EULA_ACCEPT_AND_CONTINUE_BUTTON)));
   back_button_->SetText(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_EULA_BACK_BUTTON)));
 }
 
 bool EulaView::IsUsageStatsChecked() const {
   return usage_statistics_checkbox_ && usage_statistics_checkbox_->checked();
 }
 
@@ skipping 54 matching lines @@
 // is ready, assigns it to |eula_label| and returns true so the caller
 // view calls Layout().
 static bool PublishTitleIfReady(const TabContents* contents,
                                 DOMView* eula_view,
                                 views::Label* eula_label) {
   if (!eula_view->dom_contents())
     return false;
   TabContents* tab_contents = eula_view->dom_contents()->tab_contents();
   if (contents != tab_contents)
     return false;
-  eula_label->SetText(UTF16ToWide(tab_contents->GetTitle()));
+  eula_label->SetText(tab_contents->GetTitle());
   return true;
 }
 
 void EulaView::NavigationStateChanged(const TabContents* contents,
                                       unsigned changed_flags) {
   if (changed_flags & TabContents::INVALIDATE_TITLE) {
     if (PublishTitleIfReady(contents, google_eula_view_, google_eula_label_) ||
         PublishTitleIfReady(contents, oem_eula_view_, oem_eula_label_)) {
       Layout();
     }
@@ skipping 45 matching lines @@
 }
 
 bool EulaView::FadeInOnShow() {
   return false;
 }
 
 void EulaView::OnLinkActivated(size_t index) {
 }
 
 }  // namespace chromeos