6 files changed, 18 insertions, 18 deletions
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);
   }
 };