ui/base/models: Make ComboboxModel::GetItemCount() a constant function.

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 "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 27 matching lines @@
   SECURITY_INDEX_NONE  = 0,
   SECURITY_INDEX_WEP   = 1,
   SECURITY_INDEX_PSK   = 2,
   SECURITY_INDEX_COUNT = 3
 };
 
 class SecurityComboboxModel : public ui::ComboboxModel {
  public:
   SecurityComboboxModel() {}
   virtual ~SecurityComboboxModel() {}
-  virtual int GetItemCount() {
+
+  // Overridden from ui::ComboboxModel:
+  virtual int GetItemCount() const OVERRIDE {
     return SECURITY_INDEX_COUNT;
   }
-  virtual string16 GetItemAt(int index) {
+  virtual string16 GetItemAt(int index) OVERRIDE {
     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();
   }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(SecurityComboboxModel);
 };
 
 // Methods in alphabetical order.
 enum EAPMethodComboboxIndex {
   EAP_METHOD_INDEX_NONE  = 0,
   EAP_METHOD_INDEX_LEAP  = 1,
   EAP_METHOD_INDEX_PEAP  = 2,
   EAP_METHOD_INDEX_TLS   = 3,
   EAP_METHOD_INDEX_TTLS  = 4,
   EAP_METHOD_INDEX_COUNT = 5
 };
 
 class EAPMethodComboboxModel : public ui::ComboboxModel {
  public:
   EAPMethodComboboxModel() {}
   virtual ~EAPMethodComboboxModel() {}
-  virtual int GetItemCount() {
+
+  // Overridden from ui::ComboboxModel:
+  virtual int GetItemCount() const OVERRIDE {
     return EAP_METHOD_INDEX_COUNT;
   }
-  virtual string16 GetItemAt(int index) {
+  virtual string16 GetItemAt(int index) OVERRIDE {
     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)
@@ skipping 18 matching lines @@
   PHASE_2_AUTH_INDEX_PAP      = 4,
   PHASE_2_AUTH_INDEX_CHAP     = 5,  // EAP-TTLS has up to this auth.
   PHASE_2_AUTH_INDEX_COUNT    = 6
 };
 
 class Phase2AuthComboboxModel : public ui::ComboboxModel {
  public:
   explicit Phase2AuthComboboxModel(views::Combobox* eap_method_combobox)
       : eap_method_combobox_(eap_method_combobox) {}
   virtual ~Phase2AuthComboboxModel() {}
-  virtual int GetItemCount() {
+
+  // Overridden from ui::ComboboxModel:
+  virtual int GetItemCount() const OVERRIDE {
     switch (eap_method_combobox_->selected_item()) {
       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;
   }
-  virtual string16 GetItemAt(int index) {
+  virtual string16 GetItemAt(int index) OVERRIDE {
     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();
   }
 
  private:
   views::Combobox* eap_method_combobox_;
+
   DISALLOW_COPY_AND_ASSIGN(Phase2AuthComboboxModel);
 };
 
 // Combobox that supports a preferred width.  Used by Server CA combobox
 // because the strings inside it are too wide.
 class ComboboxWithWidth : public views::Combobox {
  public:
   ComboboxWithWidth(ui::ComboboxModel* model, int width)
       : Combobox(model),
         width_(width) {
   }
   virtual ~ComboboxWithWidth() {}
   virtual gfx::Size GetPreferredSize() OVERRIDE {
     gfx::Size size = Combobox::GetPreferredSize();
     size.set_width(width_);
     return size;
   }
  private:
   int width_;
   DISALLOW_COPY_AND_ASSIGN(ComboboxWithWidth);
 };
 
 class ServerCACertComboboxModel : public ui::ComboboxModel {
  public:
   explicit ServerCACertComboboxModel(CertLibrary* cert_library)
       : cert_library_(cert_library) {
     DCHECK(cert_library);
   }
   virtual ~ServerCACertComboboxModel() {}
-  virtual int GetItemCount() {
+
+  // Overridden from ui::ComboboxModel:
+  virtual int GetItemCount() const OVERRIDE {
     if (cert_library_->CertificatesLoading())
       return 1;  // "Loading"
     // First "Default", then the certs, then "Do not check".
     return cert_library_->GetCACertificates().Size() + 2;
   }
-  virtual string16 GetItemAt(int combo_index) {
+  virtual string16 GetItemAt(int index) OVERRIDE {
     if (cert_library_->CertificatesLoading())
       return l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
-    if (combo_index == 0)
+    if (index == 0)
       return l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_SERVER_CA_DEFAULT);
-    if (combo_index == GetItemCount() - 1)
+    if (index == GetItemCount() - 1)
       return l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_SERVER_CA_DO_NOT_CHECK);
-    int cert_index = combo_index - 1;
+    int cert_index = index - 1;
     return cert_library_->GetCACertificates().GetDisplayStringAt(cert_index);
   }
 
  private:
   CertLibrary* cert_library_;
   DISALLOW_COPY_AND_ASSIGN(ServerCACertComboboxModel);
 };
 
 class UserCertComboboxModel : public ui::ComboboxModel {
  public:
   explicit UserCertComboboxModel(CertLibrary* cert_library)
       : cert_library_(cert_library) {
     DCHECK(cert_library);
   }
   virtual ~UserCertComboboxModel() {}
-  virtual int GetItemCount() {
+
+  // Overridden from ui::ComboboxModel:
+  virtual int GetItemCount() const OVERRIDE {
     if (cert_library_->CertificatesLoading())
       return 1;  // "Loading"
     int num_certs = cert_library_->GetUserCertificates().Size();
     if (num_certs == 0)
       return 1;  // "None installed"
     return num_certs;
   }
-  virtual string16 GetItemAt(int combo_index) {
+  virtual string16 GetItemAt(int index) OVERRIDE {
     if (cert_library_->CertificatesLoading())
       return l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
     if (cert_library_->GetUserCertificates().Size() == 0)
       return l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_USER_CERT_NONE_INSTALLED);
-    return cert_library_->GetUserCertificates().GetDisplayStringAt(combo_index);
+    return cert_library_->GetUserCertificates().GetDisplayStringAt(index);
   }
 
  private:
   CertLibrary* cert_library_;
+
   DISALLOW_COPY_AND_ASSIGN(UserCertComboboxModel);
 };
 
 }  // namespace
 
 WifiConfigView::WifiConfigView(NetworkConfigView* parent, WifiNetwork* wifi)
     : ChildNetworkConfigView(parent, wifi),
       cert_library_(NULL),
       ssid_textfield_(NULL),
       eap_method_combobox_(NULL),
@@ skipping 917 matching lines @@
 void WifiConfigView::ParseWiFiEAPUIProperty(
     NetworkPropertyUIData* property_ui_data,
     Network* network,
     const std::string& key) {
   ParseWiFiUIProperty(
       property_ui_data, network,
       base::StringPrintf("%s.%s", onc::wifi::kEAP, key.c_str()));
 }
 
 }  // namespace chromeos