Views Textfield fixes and cleanup.

chrome/browser/chromeos/options/vpn_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/vpn_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 511 matching lines @@
   enable_server_ca_cert_ = true;
   enable_otp_ = true;
   enable_group_name_ = true;
 
   // Server label and input.
   layout_->StartRow(0, 0);
   views::View* server_label =
       new views::Label(l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_SERVER_HOSTNAME));
   layout_->AddView(server_label);
-  server_textfield_ = new views::Textfield(views::Textfield::STYLE_DEFAULT);
-  server_textfield_->SetController(this);
+  server_textfield_ = new views::Textfield();
+  server_textfield_->set_controller(this);
   layout_->AddView(server_textfield_);
   layout_->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   if (!service_path_.empty()) {
     server_label->SetEnabled(false);
     server_textfield_->SetEnabled(false);
   }
 
   // Service label and name or input.
   layout_->StartRow(0, 0);
   layout_->AddView(new views::Label(l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_SERVICE_NAME)));
   if (service_path_.empty()) {
-    service_textfield_ = new views::Textfield(views::Textfield::STYLE_DEFAULT);
-    service_textfield_->SetController(this);
+    service_textfield_ = new views::Textfield();
+    service_textfield_->set_controller(this);
     layout_->AddView(service_textfield_);
     service_text_ = NULL;
   } else {
     service_text_ = new views::Label();
     service_text_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     layout_->AddView(service_text_);
     service_textfield_ = NULL;
   }
   layout_->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
@@ skipping 16 matching lines @@
     provider_type_combobox_ = NULL;
   }
   layout_->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // PSK passphrase label, input and visible button.
   layout_->StartRow(0, 0);
   psk_passphrase_label_ =  new views::Label(l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_PSK_PASSPHRASE));
   layout_->AddView(psk_passphrase_label_);
   psk_passphrase_textfield_ = new PassphraseTextfield();
-  psk_passphrase_textfield_->SetController(this);
+  psk_passphrase_textfield_->set_controller(this);
   layout_->AddView(psk_passphrase_textfield_);
   layout_->AddView(
       new ControlledSettingIndicatorView(psk_passphrase_ui_data_));
   layout_->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Server CA certificate
   if (service_path_.empty()) {
     layout_->StartRow(0, 0);
     server_ca_cert_label_ = new views::Label(l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_SERVER_CA));
@@ skipping 20 matching lines @@
   user_cert_combobox_ = new views::Combobox(user_cert_combobox_model_.get());
   user_cert_combobox_->set_listener(this);
   layout_->AddView(user_cert_combobox_);
   layout_->AddView(new ControlledSettingIndicatorView(user_cert_ui_data_));
   layout_->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Username label and input.
   layout_->StartRow(0, 0);
   layout_->AddView(new views::Label(l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_USERNAME)));
-  username_textfield_ = new views::Textfield(views::Textfield::STYLE_DEFAULT);
-  username_textfield_->SetController(this);
+  username_textfield_ = new views::Textfield();
+  username_textfield_->set_controller(this);
   username_textfield_->SetEnabled(username_ui_data_.IsEditable());
   layout_->AddView(username_textfield_);
   layout_->AddView(new ControlledSettingIndicatorView(username_ui_data_));
   layout_->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // User passphrase label, input and visble button.
   layout_->StartRow(0, 0);
   layout_->AddView(new views::Label(l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_USER_PASSPHRASE)));
   user_passphrase_textfield_ = new PassphraseTextfield();
-  user_passphrase_textfield_->SetController(this);
+  user_passphrase_textfield_->set_controller(this);
   user_passphrase_textfield_->SetEnabled(user_passphrase_ui_data_.IsEditable());
   layout_->AddView(user_passphrase_textfield_);
   layout_->AddView(
       new ControlledSettingIndicatorView(user_passphrase_ui_data_));
   layout_->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // OTP label and input.
   layout_->StartRow(0, 0);
   otp_label_ = new views::Label(l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_OTP));
   layout_->AddView(otp_label_);
-  otp_textfield_ = new views::Textfield(views::Textfield::STYLE_DEFAULT);
-  otp_textfield_->SetController(this);
+  otp_textfield_ = new views::Textfield();
+  otp_textfield_->set_controller(this);
   layout_->AddView(otp_textfield_);
   layout_->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Group Name label and input.
   layout_->StartRow(0, 0);
   group_name_label_ = new views::Label(l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_GROUP_NAME));
   layout_->AddView(group_name_label_);
   group_name_textfield_ =
-      new views::Textfield(views::Textfield::STYLE_DEFAULT);
-  group_name_textfield_->SetController(this);
+      new views::Textfield();
+  group_name_textfield_->set_controller(this);
   layout_->AddView(group_name_textfield_);
   layout_->AddView(new ControlledSettingIndicatorView(group_name_ui_data_));
   layout_->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Save credentials
   layout_->StartRow(0, 0);
   save_credentials_checkbox_ = new views::Checkbox(
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SAVE_CREDENTIALS));
   save_credentials_checkbox_->SetEnabled(
@@ skipping 380 matching lines @@
   property_ui_data->ParseOncProperty(
       onc_source,
       onc,
       base::StringPrintf("%s.%s.%s",
                          ::onc::network_config::kVPN,
                          dict_key.c_str(),
                          key.c_str()));
 }
 
 }  // namespace chromeos