Remove wstring from l10n_util. Part 8, the last part....

chrome/browser/chromeos/options/wifi_config_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/chromeos/options/wifi_config_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 119 matching lines @@
       id = IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_BAD_PASSPHRASE;
     else if (wifi_->error() == ERROR_BAD_WEPKEY)
       id = IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_BAD_WEPKEY;
   }
   if (id == kNoError && failed) {
     // We don't know what the error was. For now assume bad identity or
     // passphrase. See TODO comment in Login() and crosbug.com/9538.
     id = IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_BAD_CREDENTIALS;
   }
   if (id != kNoError) {
-    error_label_->SetText(l10n_util::GetString(id));
+    error_label_->SetText(UTF16ToWide(l10n_util::GetStringUTF16(id)));
     error_label_->SetVisible(true);
   } else {
     error_label_->SetVisible(false);
   }
 }
 
 void WifiConfigView::ContentsChanged(views::Textfield* sender,
                                      const string16& new_contents) {
   UpdateCanLogin();
 }
@@ skipping 141 matching lines @@
                         views::GridLayout::USE_PREF, 0, 0);
   // Textfield
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0, kPasswordWidth);
   // Password visible button
   column_set->AddColumn(views::GridLayout::CENTER, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0, 0);
 
   // SSID input
   layout->StartRow(0, column_view_set_id);
-  layout->AddView(new views::Label(l10n_util::GetString(
-      IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NETWORK_ID)));
+  layout->AddView(new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
+      IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NETWORK_ID))));
   if (!wifi_.get()) {
     ssid_textfield_ = new views::Textfield(views::Textfield::STYLE_DEFAULT);
     ssid_textfield_->SetController(this);
     layout->AddView(ssid_textfield_);
   } else {
     views::Label* label = new views::Label(ASCIIToWide(wifi_->name()));
     label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     layout->AddView(label);
   }
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   // Certificate input
   // Loaded certificates (i.e. stored in a pkcs11 device) do not require
   // a passphrase.
   bool certificate_loaded = false;
 
   // Add ID and cert password if we're using 802.1x
   // XXX we're cheating and assuming 802.1x means EAP-TLS - not true
   // in general, but very common. WPA Supplicant doesn't report the
   // EAP type because it's unknown until the process begins, and we'd
   // need some kind of callback.
   if (wifi_.get() && wifi_->encrypted() &&
       wifi_->encryption() == SECURITY_8021X) {
     layout->StartRow(0, column_view_set_id);
-    layout->AddView(new views::Label(l10n_util::GetString(
-        IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_IDENTITY)));
+    layout->AddView(new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
+        IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_IDENTITY))));
     identity_textfield_ = new views::Textfield(
         views::Textfield::STYLE_DEFAULT);
     identity_textfield_->SetController(this);
     if (!wifi_->identity().empty())
       identity_textfield_->SetText(UTF8ToUTF16(wifi_->identity()));
     layout->AddView(identity_textfield_);
     layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
     layout->StartRow(0, column_view_set_id);
-    layout->AddView(new views::Label(l10n_util::GetString(
-        IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT)));
+    layout->AddView(new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
+        IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT))));
     if (!wifi_->cert_path().empty()) {
       certificate_path_ = wifi_->cert_path();
       certificate_loaded = wifi_->IsCertificateLoaded();
     }
     if (certificate_loaded) {
-      std::wstring label = l10n_util::GetString(
-          IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_INSTALLED);
+      std::wstring label = UTF16ToWide(l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_INSTALLED));
       views::Label* cert_text = new views::Label(label);
       cert_text->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
       layout->AddView(cert_text);
     } else {
       std::wstring label;
       if (!certificate_path_.empty())
         label = UTF8ToWide(certificate_path_);
       else
-        label = l10n_util::GetString(
-            IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_BUTTON);
+        label = UTF16ToWide(l10n_util::GetStringUTF16(
+            IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_BUTTON));
       certificate_browse_button_ = new views::NativeButton(this, label);
       layout->AddView(certificate_browse_button_);
     }
     layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   }
 
   // Security select
   if (!wifi_.get()) {
     layout->StartRow(0, column_view_set_id);
-    layout->AddView(new views::Label(l10n_util::GetString(
-          IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY)));
+    layout->AddView(new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY))));
     security_combobox_ = new views::Combobox(new SecurityComboboxModel());
     security_combobox_->set_listener(this);
     layout->AddView(security_combobox_);
     layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   }
 
   // Passphrase input
   layout->StartRow(0, column_view_set_id);
   int label_text_id;
   if (wifi_.get() && wifi_->encryption() == SECURITY_8021X) {
     label_text_id =
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PRIVATE_KEY_PASSWORD;
   } else {
     label_text_id = IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE;
   }
-  layout->AddView(new views::Label(l10n_util::GetString(label_text_id)));
+  layout->AddView(new views::Label(
+      UTF16ToWide(l10n_util::GetStringUTF16(label_text_id))));
   passphrase_textfield_ = new views::Textfield(
       views::Textfield::STYLE_PASSWORD);
   passphrase_textfield_->SetController(this);
   if (wifi_.get() && !wifi_->passphrase().empty())
     passphrase_textfield_->SetText(UTF8ToUTF16(wifi_->passphrase()));
   // Disable passphrase input initially for other network.
   if (!wifi_.get())
     passphrase_textfield_->SetEnabled(false);
   layout->AddView(passphrase_textfield_);
   // Password visible button.
@@ skipping 13 matching lines @@
   error_label_ = new views::Label();
   error_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   error_label_->SetColor(SK_ColorRED);
   layout->AddView(error_label_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   // Set or hide the error text.
   UpdateErrorLabel(false);
 }
 
 }  // namespace chromeos