Merge NativeTextfieldViews into views::Textfield.

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 389 matching lines @@
   static const size_t kMinWirelessPasswordLen = 5;
 
   // We either have an existing wifi network or the user entered an SSID.
   if (service_path_.empty() && GetSsid().empty())
     return false;
 
   // If the network requires a passphrase, make sure it is the right length.
   if (passphrase_textfield_ != NULL &&
       passphrase_textfield_->enabled() &&
       !passphrase_textfield_->show_fake() &&
-      passphrase_textfield_->text().length() < kMinWirelessPasswordLen)
+      passphrase_textfield_->GetText().length() < kMinWirelessPasswordLen)
     return false;
 
   // If we're using EAP, we must have a method.
   if (eap_method_combobox_ &&
       eap_method_combobox_->selected_index() == EAP_METHOD_INDEX_NONE)
     return false;
 
   // Block login if certs are required but user has none.
   if (UserCertRequired() && (!HaveUserCerts() || !IsUserCertValid()))
       return false;
@@ skipping 304 matching lines @@
     }
     ash::network_connect::ConfigureNetworkAndConnect(
         service_path_, properties, share_network);
   }
   return true;  // dialog will be closed
 }
 
 std::string WifiConfigView::GetSsid() const {
   std::string result;
   if (ssid_textfield_ != NULL) {
-    std::string untrimmed = base::UTF16ToUTF8(ssid_textfield_->text());
+    std::string untrimmed = base::UTF16ToUTF8(ssid_textfield_->GetText());
     TrimWhitespaceASCII(untrimmed, TRIM_ALL, &result);
   }
   return result;
 }
 
 std::string WifiConfigView::GetPassphrase() const {
   std::string result;
   if (passphrase_textfield_ != NULL)
-    result = base::UTF16ToUTF8(passphrase_textfield_->text());
+    result = base::UTF16ToUTF8(passphrase_textfield_->GetText());
   return result;
 }
 
 bool WifiConfigView::GetSaveCredentials() const {
   if (!save_credentials_checkbox_)
     return true;  // share networks by default (e.g. non 8021x).
   return save_credentials_checkbox_->checked();
 }
 
 bool WifiConfigView::GetShareNetwork(bool share_default) const {
@@ skipping 58 matching lines @@
 }
 
 bool WifiConfigView::GetEapUseSystemCas() const {
   DCHECK(server_ca_cert_combobox_);
   // Only use system CAs if the first item ("Default") is selected.
   return server_ca_cert_combobox_->selected_index() == 0;
 }
 
 std::string WifiConfigView::GetEapSubjectMatch() const {
   DCHECK(subject_match_textfield_);
-  return base::UTF16ToUTF8(subject_match_textfield_->text());
+  return base::UTF16ToUTF8(subject_match_textfield_->GetText());
 }
 
 std::string WifiConfigView::GetEapClientCertPkcs11Id() const {
   DCHECK(user_cert_combobox_);
   if (!HaveUserCerts() || !UserCertActive()) {
     return std::string();  // No certificate selected or not required.
   } else {
     // Certificates are listed in the order they appear in the model.
     int index = user_cert_combobox_->selected_index();
     return CertLibrary::Get()->GetCertPkcs11IdAt(
         CertLibrary::CERT_TYPE_USER, index);
   }
 }
 
 std::string WifiConfigView::GetEapIdentity() const {
   DCHECK(identity_textfield_);
-  return base::UTF16ToUTF8(identity_textfield_->text());
+  return base::UTF16ToUTF8(identity_textfield_->GetText());
 }
 
 std::string WifiConfigView::GetEapAnonymousIdentity() const {
   DCHECK(identity_anonymous_textfield_);
-  return base::UTF16ToUTF8(identity_anonymous_textfield_->text());
+  return base::UTF16ToUTF8(identity_anonymous_textfield_->GetText());
 }
 
 void WifiConfigView::SetEapProperties(base::DictionaryValue* properties) {
   properties->SetStringWithoutPathExpansion(
       shill::kEapIdentityProperty, GetEapIdentity());
   properties->SetStringWithoutPathExpansion(
       shill::kEapMethodProperty, GetEapMethod());
   properties->SetStringWithoutPathExpansion(
       shill::kEapPhase2AuthProperty, GetEapPhase2Auth());
   properties->SetStringWithoutPathExpansion(
@@ skipping 491 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