views: Rename Combobox "selected getter/setter" accessors to something more accurate.

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 "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 345 matching lines @@
 const std::string VPNConfigView::GetGroupName() const {
   return GetTextFromField(group_name_textfield_, false);
 }
 
 const std::string VPNConfigView::GetOTP() const {
   return GetTextFromField(otp_textfield_, true);
 }
 
 const std::string VPNConfigView::GetServerCACertNssNickname() const {
   DCHECK(cert_library_);
-  int selected =
-      server_ca_cert_combobox_ ? server_ca_cert_combobox_->selected_item() : 0;
-  if (selected == 0) {
+  int index = server_ca_cert_combobox_ ?
+      server_ca_cert_combobox_->selected_index() : 0;
+  if (index == 0) {
     // First item is "Default".
     return std::string();
   } else {
     DCHECK(cert_library_);
     DCHECK_GT(cert_library_->GetCACertificates().Size(), 0);
-    int cert_index = selected - 1;
+    int cert_index = index - 1;
     return cert_library_->GetCACertificates().GetNicknameAt(cert_index);
   }
 }
 
 const std::string VPNConfigView::GetUserCertID() const {
   DCHECK(cert_library_);
   if (!HaveUserCerts()) {
     return std::string();  // "None installed"
   } else {
     // Certificates are listed in the order they appear in the model.
-    int selected =
-        user_cert_combobox_ ? user_cert_combobox_->selected_item() : 0;
-    return cert_library_->GetUserCertificates().GetPkcs11IdAt(selected);
+    int index = user_cert_combobox_ ? user_cert_combobox_->selected_index() : 0;
+    return cert_library_->GetUserCertificates().GetPkcs11IdAt(index);
   }
 }
 
 void VPNConfigView::Init(VirtualNetwork* vpn) {
   if (vpn) {
     ParseVPNUIProperty(&ca_cert_ui_data_, vpn, onc::vpn::kServerCARef);
     ParseVPNUIProperty(&psk_passphrase_ui_data_, vpn, onc::vpn::kPSK);
     ParseVPNUIProperty(&user_cert_ui_data_, vpn, onc::vpn::kClientCertRef);
     ParseVPNUIProperty(&username_ui_data_, vpn, onc::vpn::kUsername);
     ParseVPNUIProperty(&user_passphrase_ui_data_, vpn, onc::vpn::kPassword);
@@ skipping 233 matching lines @@
   VirtualNetwork* vpn = cros->FindVirtualNetworkByPath(service_path_);
   if (server_ca_cert_combobox_) {
     server_ca_cert_combobox_->ModelChanged();
     if (enable_server_ca_cert_ &&
         (vpn && !vpn->ca_cert_nss().empty())) {
       // Select the current server CA certificate in the combobox.
       int cert_index = cert_library_->GetCACertificates().FindCertByNickname(
           vpn->ca_cert_nss());
       if (cert_index >= 0) {
         // Skip item for "Default"
-        server_ca_cert_combobox_->SetSelectedItem(1 + cert_index);
+        server_ca_cert_combobox_->SetSelectedIndex(1 + cert_index);
       } else {
-        server_ca_cert_combobox_->SetSelectedItem(0);
+        server_ca_cert_combobox_->SetSelectedIndex(0);
       }
     } else {
-      server_ca_cert_combobox_->SetSelectedItem(0);
+      server_ca_cert_combobox_->SetSelectedIndex(0);
     }
   }
 
   if (user_cert_combobox_) {
     user_cert_combobox_->ModelChanged();
     if (enable_user_cert_ &&
         (vpn && !vpn->client_cert_id().empty())) {
       int cert_index = cert_library_->GetUserCertificates().FindCertByPkcs11Id(
           vpn->client_cert_id());
       if (cert_index >= 0)
-        user_cert_combobox_->SetSelectedItem(cert_index);
+        user_cert_combobox_->SetSelectedIndex(cert_index);
       else
-        user_cert_combobox_->SetSelectedItem(0);
+        user_cert_combobox_->SetSelectedIndex(0);
     } else {
-      user_cert_combobox_->SetSelectedItem(0);
+      user_cert_combobox_->SetSelectedIndex(0);
     }
   }
 
   UpdateErrorLabel();
 }
 
 void VPNConfigView::UpdateControlsToEnable() {
   // Set which controls are enabled.
   enable_psk_passphrase_ = false;
   enable_user_cert_ = false;
@@ skipping 96 matching lines @@
   return provider_type_ == PROVIDER_TYPE_L2TP_IPSEC_USER_CERT;
 }
 
 bool VPNConfigView::HaveUserCerts() const {
   return cert_library_->GetUserCertificates().Size() > 0;
 }
 
 bool VPNConfigView::IsUserCertValid() const {
   if (!user_cert_combobox_ || !enable_user_cert_)
     return false;
-  int selected = user_cert_combobox_->selected_item();
-  if (selected < 0)
+  int index = user_cert_combobox_->selected_index();
+  if (index < 0)
     return false;
   // Currently only hardware-backed user certificates are valid.
   if (cert_library_->IsHardwareBacked() &&
-      !cert_library_->GetUserCertificates().IsHardwareBackedAt(selected))
+      !cert_library_->GetUserCertificates().IsHardwareBackedAt(index))
     return false;
   return true;
 }
 
-const std::string VPNConfigView::GetTextFromField(
-    views::Textfield* textfield, bool trim_whitespace) const {
+const std::string VPNConfigView::GetTextFromField(views::Textfield* textfield,
+                                                  bool trim_whitespace) const {
   if (!textfield)
     return std::string();
   std::string untrimmed = UTF16ToUTF8(textfield->text());
   if (!trim_whitespace)
     return untrimmed;
   std::string result;
   TrimWhitespaceASCII(untrimmed, TRIM_ALL, &result);
   return result;
 }
 
@@ skipping 18 matching lines @@
   std::string vpn_type;
   if (!vpn_dict || !vpn_dict->GetString(onc::kType, &vpn_type))
     return;
 
   property_ui_data->ParseOncProperty(
       network->ui_data(), onc,
       base::StringPrintf("%s.%s.%s", onc::kVPN, vpn_type.c_str(), key.c_str()));
 }
 
 }  // namespace chromeos