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

R=sky@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=128961

Review URL: https://chromiumcodereview.appspot.com/9838092

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129071 0039d316-1c4b-4281-b951-d872f2087c98

15 files changed, 73 insertions, 52 deletions

diff --git a/chrome/browser/bookmarks/recently_used_folders_combo_model.cc b/chrome/browser/bookmarks/recently_used_folders_combo_model.cc
index ecf2dfea..0e6dfe3 100644
--- a/chrome/browser/bookmarks/recently_used_folders_combo_model.cc
+++ b/chrome/browser/bookmarks/recently_used_folders_combo_model.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -54,7 +54,7 @@ RecentlyUsedFoldersComboModel::RecentlyUsedFoldersComboModel(
 
 RecentlyUsedFoldersComboModel::~RecentlyUsedFoldersComboModel() {}
 
-int RecentlyUsedFoldersComboModel::GetItemCount() {
+int RecentlyUsedFoldersComboModel::GetItemCount() const {
   return static_cast<int>(nodes_.size() + 1);
 }
 
diff --git a/chrome/browser/bookmarks/recently_used_folders_combo_model.h b/chrome/browser/bookmarks/recently_used_folders_combo_model.h
index 9411865..e1a1cc7 100644
--- a/chrome/browser/bookmarks/recently_used_folders_combo_model.h
+++ b/chrome/browser/bookmarks/recently_used_folders_combo_model.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -21,7 +21,7 @@ class RecentlyUsedFoldersComboModel : public ui::ComboboxModel {
   virtual ~RecentlyUsedFoldersComboModel();
 
   // Overridden from ui::ComboboxModel:
-  virtual int GetItemCount() OVERRIDE;
+  virtual int GetItemCount() const OVERRIDE;
   virtual string16 GetItemAt(int index) OVERRIDE;
 
   // Returns the node at the specified |index|.
diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc
index 4f657b5..bf8f30f 100644
--- a/chrome/browser/chromeos/options/vpn_config_view.cc
+++ b/chrome/browser/chromeos/options/vpn_config_view.cc
@@ -56,13 +56,16 @@ class ProviderTypeComboboxModel : public ui::ComboboxModel {
  public:
   ProviderTypeComboboxModel() {}
   virtual ~ProviderTypeComboboxModel() {}
-  virtual int GetItemCount() {
+
+  // Overridden from ui::ComboboxModel:
+  virtual int GetItemCount() const OVERRIDE {
     return chromeos::PROVIDER_TYPE_MAX;
   }
-  virtual string16 GetItemAt(int index) {
+  virtual string16 GetItemAt(int index) OVERRIDE {
     ProviderType type = static_cast<ProviderType>(index);
     return ProviderTypeToString(type);
   }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(ProviderTypeComboboxModel);
 };
@@ -73,25 +76,28 @@ class ServerCACertComboboxModel : public ui::ComboboxModel {
       : cert_library_(cert_library) {
   }
   virtual ~ServerCACertComboboxModel() {}
-  virtual int GetItemCount() {
+
+  // Overridden from ui::ComboboxModel:
+  virtual int GetItemCount() const OVERRIDE {
     if (cert_library_->CertificatesLoading())
       return 1;  // "Loading"
     // "Default" + certs.
     return cert_library_->GetCACertificates().Size() + 1;
   }
-  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);
-    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);
 };
 
@@ -101,7 +107,9 @@ class UserCertComboboxModel : public ui::ComboboxModel {
       : cert_library_(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();
@@ -109,7 +117,7 @@ class UserCertComboboxModel : public ui::ComboboxModel {
       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);
@@ -118,7 +126,7 @@ class UserCertComboboxModel : public ui::ComboboxModel {
       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:
diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc
index 08ed40a..9a5b828 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.cc
+++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -45,10 +45,12 @@ 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);
@@ -61,6 +63,7 @@ class SecurityComboboxModel : public ui::ComboboxModel {
     NOTREACHED();
     return string16();
   }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(SecurityComboboxModel);
 };
@@ -79,10 +82,12 @@ 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);
@@ -121,7 +126,9 @@ class Phase2AuthComboboxModel : public ui::ComboboxModel {
   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:
@@ -135,7 +142,7 @@ class Phase2AuthComboboxModel : public ui::ComboboxModel {
     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);
@@ -160,6 +167,7 @@ class Phase2AuthComboboxModel : public ui::ComboboxModel {
 
  private:
   views::Combobox* eap_method_combobox_;
+
   DISALLOW_COPY_AND_ASSIGN(Phase2AuthComboboxModel);
 };
 
@@ -189,23 +197,25 @@ class ServerCACertComboboxModel : public ui::ComboboxModel {
     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);
   }
 
@@ -221,7 +231,9 @@ class UserCertComboboxModel : public ui::ComboboxModel {
     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();
@@ -229,18 +241,19 @@ class UserCertComboboxModel : public ui::ComboboxModel {
       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);
 };
 
diff --git a/chrome/browser/ui/views/cookie_info_view.cc b/chrome/browser/ui/views/cookie_info_view.cc
index fc6f63d..12f945e 100644
--- a/chrome/browser/ui/views/cookie_info_view.cc
+++ b/chrome/browser/ui/views/cookie_info_view.cc
@@ -145,7 +145,7 @@ void CookieInfoView::ItemChanged(views::Combobox* combo_box,
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookieInfoView, ui::ComboboxModel overrides.
-int CookieInfoView::GetItemCount() {
+int CookieInfoView::GetItemCount() const {
   return static_cast<int>(expire_combo_values_.size());
 }
 
diff --git a/chrome/browser/ui/views/cookie_info_view.h b/chrome/browser/ui/views/cookie_info_view.h
index a2f2908..529da69 100644
--- a/chrome/browser/ui/views/cookie_info_view.h
+++ b/chrome/browser/ui/views/cookie_info_view.h
@@ -74,7 +74,7 @@ class CookieInfoView : public views::View,
                            int new_index) OVERRIDE;
 
   // ui::ComboboxModel:
-  virtual int GetItemCount() OVERRIDE;
+  virtual int GetItemCount() const OVERRIDE;
   virtual string16 GetItemAt(int index) OVERRIDE;
 
  private:
diff --git a/chrome/browser/ui/views/uninstall_view.cc b/chrome/browser/ui/views/uninstall_view.cc
index b7fc343..a59249d 100644
--- a/chrome/browser/ui/views/uninstall_view.cc
+++ b/chrome/browser/ui/views/uninstall_view.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -142,7 +142,7 @@ views::View* UninstallView::GetContentsView() {
   return this;
 }
 
-int UninstallView::GetItemCount() {
+int UninstallView::GetItemCount() const {
   DCHECK(!browsers_->empty());
   return browsers_->size();
 }
diff --git a/chrome/browser/ui/views/uninstall_view.h b/chrome/browser/ui/views/uninstall_view.h
index 8002b29..181c07a 100644
--- a/chrome/browser/ui/views/uninstall_view.h
+++ b/chrome/browser/ui/views/uninstall_view.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -42,7 +42,7 @@ class UninstallView : public views::ButtonListener,
   virtual views::View* GetContentsView() OVERRIDE;
 
   // Overridden from ui::ComboboxModel:
-  virtual int GetItemCount() OVERRIDE;
+  virtual int GetItemCount() const OVERRIDE;
   virtual string16 GetItemAt(int index) OVERRIDE;
 
  private:
diff --git a/ui/base/models/combobox_model.h b/ui/base/models/combobox_model.h
index 8282645..81fb048 100644
--- a/ui/base/models/combobox_model.h
+++ b/ui/base/models/combobox_model.h
@@ -14,7 +14,7 @@ namespace ui {
 class ComboboxModel {
  public:
   // Returns the number of items in the combo box.
-  virtual int GetItemCount() = 0;
+  virtual int GetItemCount() const = 0;
 
   // Returns the string at the specified index.
   virtual string16 GetItemAt(int index) = 0;
diff --git a/ui/views/controls/combobox/native_combobox_views_unittest.cc b/ui/views/controls/combobox/native_combobox_views_unittest.cc
index 2474c4a..4143d22 100644
--- a/ui/views/controls/combobox/native_combobox_views_unittest.cc
+++ b/ui/views/controls/combobox/native_combobox_views_unittest.cc
@@ -50,19 +50,20 @@ class TestCombobox : public views::Combobox {
   DISALLOW_COPY_AND_ASSIGN(TestCombobox);
 };
 
-// A concrete class is needed to test the combobox
+// A concrete class is needed to test the combo box.
 class TestComboboxModel : public ui::ComboboxModel {
  public:
   TestComboboxModel() {}
   virtual ~TestComboboxModel() {}
-  virtual int GetItemCount() {
+
+  // Overridden from ui::ComboboxModel:
+  virtual int GetItemCount() const OVERRIDE {
     return 4;
   }
-  virtual string16 GetItemAt(int index) {
-    EXPECT_GE(index, 0);
-    EXPECT_LT(index, GetItemCount());
+  virtual string16 GetItemAt(int index) OVERRIDE {
     return string16();
   }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(TestComboboxModel);
 };
diff --git a/ui/views/examples/combobox_example.cc b/ui/views/examples/combobox_example.cc
index 5a26ddd0..f392383 100644
--- a/ui/views/examples/combobox_example.cc
+++ b/ui/views/examples/combobox_example.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -19,7 +19,7 @@ class ComboboxModelExample : public ui::ComboboxModel {
   virtual ~ComboboxModelExample() {}
 
   // Overridden from ui::ComboboxModel:
-  virtual int GetItemCount() OVERRIDE { return 10; }
+  virtual int GetItemCount() const OVERRIDE { return 10; }
   virtual string16 GetItemAt(int index) OVERRIDE {
     return UTF8ToUTF16(base::StringPrintf("Item %d", index));
   }
diff --git a/ui/views/examples/example_combobox_model.cc b/ui/views/examples/example_combobox_model.cc
index 800b64e..c1a6b39 100644
--- a/ui/views/examples/example_combobox_model.cc
+++ b/ui/views/examples/example_combobox_model.cc
@@ -1,12 +1,10 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "ui/views/examples/example_combobox_model.h"
 
-#include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
-#include "ui/base/models/combobox_model.h"
 
 namespace views {
 namespace examples {
@@ -18,7 +16,7 @@ ExampleComboboxModel::ExampleComboboxModel(const char** strings, int count)
 ExampleComboboxModel::~ExampleComboboxModel() {
 }
 
-int ExampleComboboxModel::GetItemCount() {
+int ExampleComboboxModel::GetItemCount() const {
   return count_;
 }
 
diff --git a/ui/views/examples/example_combobox_model.h b/ui/views/examples/example_combobox_model.h
index 6bebec9..1437401 100644
--- a/ui/views/examples/example_combobox_model.h
+++ b/ui/views/examples/example_combobox_model.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -6,6 +6,7 @@
 #define UI_VIEWS_EXAMPLES_EXAMPLE_COMBOBOX_MODEL_H_
 #pragma once
 
+#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/base/models/combobox_model.h"
 
@@ -18,7 +19,7 @@ class ExampleComboboxModel : public ui::ComboboxModel {
   virtual ~ExampleComboboxModel();
 
   // Overridden from ui::ComboboxModel:
-  virtual int GetItemCount() OVERRIDE;
+  virtual int GetItemCount() const OVERRIDE;
   virtual string16 GetItemAt(int index) OVERRIDE;
 
  private:
diff --git a/ui/views/examples/examples_window.cc b/ui/views/examples/examples_window.cc
index d5addc3..305d111 100644
--- a/ui/views/examples/examples_window.cc
+++ b/ui/views/examples/examples_window.cc
@@ -54,7 +54,7 @@ class ComboboxModelExampleList : public ui::ComboboxModel {
   virtual ~ComboboxModelExampleList() {}
 
   // Overridden from ui::ComboboxModel:
-  virtual int GetItemCount() OVERRIDE { return example_list_.size(); }
+  virtual int GetItemCount() const OVERRIDE { return example_list_.size(); }
   virtual string16 GetItemAt(int index) OVERRIDE {
     return UTF8ToUTF16(example_list_[index]->example_title());
   }
diff --git a/ui/views/focus/focus_traversal_unittest.cc b/ui/views/focus/focus_traversal_unittest.cc
index f0ef1f4..471f7aa8 100644
--- a/ui/views/focus/focus_traversal_unittest.cc
+++ b/ui/views/focus/focus_traversal_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -88,9 +88,9 @@ const int kThumbnailSuperStarID = count++;
 
 class DummyComboboxModel : public ui::ComboboxModel {
  public:
-  virtual int GetItemCount() { return 10; }
-
-  virtual string16 GetItemAt(int index) {
+  // Overridden from ui::ComboboxModel:
+  virtual int GetItemCount() const OVERRIDE { return 10; }
+  virtual string16 GetItemAt(int index) OVERRIDE {
     return ASCIIToUTF16("Item ") + base::IntToString16(index);
   }
 };