Replace string16 with base::string16.

chrome/browser/chromeos/options/wifi_config_view.cc

 // Copyright (c) 2012 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 "ash/system/chromeos/network/network_connect.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 88 matching lines @@
 
 namespace internal {
 
 class SecurityComboboxModel : public ui::ComboboxModel {
  public:
   SecurityComboboxModel();
   virtual ~SecurityComboboxModel();
 
   // Overridden from ui::ComboboxModel:
   virtual int GetItemCount() const OVERRIDE;
-  virtual string16 GetItemAt(int index) OVERRIDE;
+  virtual base::string16 GetItemAt(int index) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SecurityComboboxModel);
 };
 
 class EAPMethodComboboxModel : public ui::ComboboxModel {
  public:
   EAPMethodComboboxModel();
   virtual ~EAPMethodComboboxModel();
 
   // Overridden from ui::ComboboxModel:
   virtual int GetItemCount() const OVERRIDE;
-  virtual string16 GetItemAt(int index) OVERRIDE;
+  virtual base::string16 GetItemAt(int index) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EAPMethodComboboxModel);
 };
 
 class Phase2AuthComboboxModel : public ui::ComboboxModel {
  public:
   explicit Phase2AuthComboboxModel(views::Combobox* eap_method_combobox);
   virtual ~Phase2AuthComboboxModel();
 
   // Overridden from ui::ComboboxModel:
   virtual int GetItemCount() const OVERRIDE;
-  virtual string16 GetItemAt(int index) OVERRIDE;
+  virtual base::string16 GetItemAt(int index) OVERRIDE;
 
  private:
   views::Combobox* eap_method_combobox_;
 
   DISALLOW_COPY_AND_ASSIGN(Phase2AuthComboboxModel);
 };
 
 class ServerCACertComboboxModel : public ui::ComboboxModel {
  public:
   ServerCACertComboboxModel();
   virtual ~ServerCACertComboboxModel();
 
   // Overridden from ui::ComboboxModel:
   virtual int GetItemCount() const OVERRIDE;
-  virtual string16 GetItemAt(int index) OVERRIDE;
+  virtual base::string16 GetItemAt(int index) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ServerCACertComboboxModel);
 };
 
 class UserCertComboboxModel : public ui::ComboboxModel {
  public:
   explicit UserCertComboboxModel(WifiConfigView* owner);
   virtual ~UserCertComboboxModel();
 
   // Overridden from ui::ComboboxModel:
   virtual int GetItemCount() const OVERRIDE;
-  virtual string16 GetItemAt(int index) OVERRIDE;
+  virtual base::string16 GetItemAt(int index) OVERRIDE;
 
  private:
   WifiConfigView* owner_;
 
   DISALLOW_COPY_AND_ASSIGN(UserCertComboboxModel);
 };
 
 // SecurityComboboxModel -------------------------------------------------------
 
 SecurityComboboxModel::SecurityComboboxModel() {
 }
 
 SecurityComboboxModel::~SecurityComboboxModel() {
 }
 
 int SecurityComboboxModel::GetItemCount() const {
     return SECURITY_INDEX_COUNT;
   }
-string16 SecurityComboboxModel::GetItemAt(int index) {
+base::string16 SecurityComboboxModel::GetItemAt(int index) {
   if (index == SECURITY_INDEX_NONE)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_NONE);
   else if (index == SECURITY_INDEX_WEP)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_WEP);
   else if (index == SECURITY_INDEX_PSK)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_PSK);
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
 // EAPMethodComboboxModel ------------------------------------------------------
 
 EAPMethodComboboxModel::EAPMethodComboboxModel() {
 }
 
 EAPMethodComboboxModel::~EAPMethodComboboxModel() {
 }
 
 int EAPMethodComboboxModel::GetItemCount() const {
   return EAP_METHOD_INDEX_COUNT;
 }
-string16 EAPMethodComboboxModel::GetItemAt(int index) {
+base::string16 EAPMethodComboboxModel::GetItemAt(int index) {
   if (index == EAP_METHOD_INDEX_NONE)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_EAP_METHOD_NONE);
   else if (index == EAP_METHOD_INDEX_LEAP)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_EAP_METHOD_LEAP);
   else if (index == EAP_METHOD_INDEX_PEAP)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_EAP_METHOD_PEAP);
   else if (index == EAP_METHOD_INDEX_TLS)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_EAP_METHOD_TLS);
   else if (index == EAP_METHOD_INDEX_TTLS)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_EAP_METHOD_TTLS);
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
 // Phase2AuthComboboxModel -----------------------------------------------------
 
 Phase2AuthComboboxModel::Phase2AuthComboboxModel(
     views::Combobox* eap_method_combobox)
     : eap_method_combobox_(eap_method_combobox) {
 }
 
 Phase2AuthComboboxModel::~Phase2AuthComboboxModel() {
 }
 
 int Phase2AuthComboboxModel::GetItemCount() const {
   switch (eap_method_combobox_->selected_index()) {
     case EAP_METHOD_INDEX_NONE:
     case EAP_METHOD_INDEX_TLS:
     case EAP_METHOD_INDEX_LEAP:
       return PHASE_2_AUTH_INDEX_AUTO + 1;
     case EAP_METHOD_INDEX_PEAP:
       return PHASE_2_AUTH_INDEX_MSCHAPV2 + 1;
     case EAP_METHOD_INDEX_TTLS:
       return PHASE_2_AUTH_INDEX_CHAP + 1;
   }
   NOTREACHED();
   return 0;
 }
 
-string16 Phase2AuthComboboxModel::GetItemAt(int index) {
+base::string16 Phase2AuthComboboxModel::GetItemAt(int index) {
   if (index == PHASE_2_AUTH_INDEX_AUTO)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PHASE_2_AUTH_AUTO);
   else if (index == PHASE_2_AUTH_INDEX_MD5)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PHASE_2_AUTH_MD5);
   else if (index == PHASE_2_AUTH_INDEX_MSCHAPV2)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PHASE_2_AUTH_MSCHAPV2);
   else if (index == PHASE_2_AUTH_INDEX_MSCHAP)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PHASE_2_AUTH_MSCHAP);
   else if (index == PHASE_2_AUTH_INDEX_PAP)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PHASE_2_AUTH_PAP);
   else if (index == PHASE_2_AUTH_INDEX_CHAP)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PHASE_2_AUTH_CHAP);
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
 // ServerCACertComboboxModel ---------------------------------------------------
 
 ServerCACertComboboxModel::ServerCACertComboboxModel() {
 }
 
 ServerCACertComboboxModel::~ServerCACertComboboxModel() {
 }
 
 int ServerCACertComboboxModel::GetItemCount() const {
   if (CertLibrary::Get()->CertificatesLoading())
     return 1;  // "Loading"
   // First "Default", then the certs, then "Do not check".
   return CertLibrary::Get()->NumCertificates(
       CertLibrary::CERT_TYPE_SERVER_CA) + 2;
 }
 
-string16 ServerCACertComboboxModel::GetItemAt(int index) {
+base::string16 ServerCACertComboboxModel::GetItemAt(int index) {
   if (CertLibrary::Get()->CertificatesLoading())
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
   if (index == 0)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_SERVER_CA_DEFAULT);
   if (index == GetItemCount() - 1)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_SERVER_CA_DO_NOT_CHECK);
   int cert_index = index - 1;
@@ skipping 15 matching lines @@
     return 0;
   if (CertLibrary::Get()->CertificatesLoading())
     return 1;  // "Loading"
   int num_certs =
       CertLibrary::Get()->NumCertificates(CertLibrary::CERT_TYPE_USER);
   if (num_certs == 0)
     return 1;  // "None installed"
   return num_certs;
 }
 
-string16 UserCertComboboxModel::GetItemAt(int index) {
+base::string16 UserCertComboboxModel::GetItemAt(int index) {
   if (!owner_->UserCertActive())
-    return string16();
+    return base::string16();
   if (CertLibrary::Get()->CertificatesLoading())
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
   if (CertLibrary::Get()->NumCertificates(CertLibrary::CERT_TYPE_USER) == 0)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_USER_CERT_NONE_INSTALLED);
   return CertLibrary::Get()->GetCertDisplayStringAt(
       CertLibrary::CERT_TYPE_USER, index);
 }
 
@@ skipping 32 matching lines @@
 
 WifiConfigView::~WifiConfigView() {
   RemoveAllChildViews(true);  // Destroy children before models
   if (NetworkHandler::IsInitialized()) {
     NetworkHandler::Get()->network_state_handler()->RemoveObserver(
         this, FROM_HERE);
   }
   CertLibrary::Get()->RemoveObserver(this);
 }
 
-string16 WifiConfigView::GetTitle() const {
+base::string16 WifiConfigView::GetTitle() const {
   return l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_JOIN_WIFI_NETWORKS);
 }
 
 views::View* WifiConfigView::GetInitiallyFocusedView() {
   // Return a reasonable widget for initial focus,
   // depending on what we're showing.
   if (ssid_textfield_)
     return ssid_textfield_;
   else if (eap_method_combobox_)
     return eap_method_combobox_;
@@ skipping 97 matching lines @@
   phase_2_auth_combobox_->SetEnabled(phase_2_auth_enabled &&
                                      phase_2_auth_ui_data_.IsEditable());
   phase_2_auth_label_->SetEnabled(phase_2_auth_enabled);
 
   // Passphrase.
   bool passphrase_enabled = PassphraseActive();
   passphrase_textfield_->SetEnabled(passphrase_enabled &&
                                     passphrase_ui_data_.IsEditable());
   passphrase_label_->SetEnabled(passphrase_enabled);
   if (!passphrase_enabled)
-    passphrase_textfield_->SetText(string16());
+    passphrase_textfield_->SetText(base::string16());
 
   // User cert.
   bool certs_loading = CertLibrary::Get()->CertificatesLoading();
   bool user_cert_enabled = UserCertActive();
   user_cert_label_->SetEnabled(user_cert_enabled);
   bool have_user_certs = !certs_loading && HaveUserCerts();
   user_cert_combobox_->SetEnabled(user_cert_enabled &&
                                   have_user_certs &&
                                   user_cert_ui_data_.IsEditable());
   user_cert_combobox_->ModelChanged();
   user_cert_combobox_->SetSelectedIndex(0);
 
   // Server CA.
   bool ca_cert_enabled = CaCertActive();
   server_ca_cert_label_->SetEnabled(ca_cert_enabled);
   server_ca_cert_combobox_->SetEnabled(ca_cert_enabled &&
                                        !certs_loading &&
                                        server_ca_cert_ui_data_.IsEditable());
   server_ca_cert_combobox_->ModelChanged();
   server_ca_cert_combobox_->SetSelectedIndex(0);
 
   // Subject Match
   bool subject_match_enabled =
       ca_cert_enabled && eap_method_combobox_ &&
       eap_method_combobox_->selected_index() == EAP_METHOD_INDEX_TLS;
   subject_match_label_->SetEnabled(subject_match_enabled);
   subject_match_textfield_->SetEnabled(subject_match_enabled);
   if (!subject_match_enabled)
-    subject_match_textfield_->SetText(string16());
+    subject_match_textfield_->SetText(base::string16());
 
   // No anonymous identity if no phase 2 auth.
   bool identity_anonymous_enabled = phase_2_auth_enabled;
   identity_anonymous_textfield_->SetEnabled(
       identity_anonymous_enabled && identity_anonymous_ui_data_.IsEditable());
   identity_anonymous_label_->SetEnabled(identity_anonymous_enabled);
   if (!identity_anonymous_enabled)
-    identity_anonymous_textfield_->SetText(string16());
+    identity_anonymous_textfield_->SetText(base::string16());
 
   RefreshShareCheckbox();
 }
 
 void WifiConfigView::RefreshShareCheckbox() {
   if (!share_network_checkbox_)
     return;
 
   if (security_combobox_ &&
       security_combobox_->selected_index() == SECURITY_INDEX_NONE) {
@@ skipping 794 matching lines @@
 void WifiConfigView::ParseWiFiEAPUIProperty(
     NetworkPropertyUIData* property_ui_data,
     const NetworkState* network,
     const std::string& key) {
   ParseWiFiUIProperty(
       property_ui_data, network,
       base::StringPrintf("%s.%s", ::onc::wifi::kEAP, key.c_str()));
 }
 
 }  // namespace chromeos