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

ui/views/focus/focus_traversal_unittest.cc

-// 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/focus/focus_manager.h"
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/radio_button.h"
@@ skipping 69 matching lines @@
 const int kSearchTextfieldID = count++;
 const int kSearchButtonID = count++;
 const int kHelpLinkID = count++;
 
 const int kThumbnailContainerID = count++;  // 45
 const int kThumbnailStarID = count++;
 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);
   }
 };
 
 // A View that can act as a pane.
 class PaneView : public View, public FocusTraversable {
  public:
   PaneView() : focus_search_(NULL) {}
 
   // If this method is called, this view will use GetPaneFocusTraversable to
@@ skipping 697 matching lines @@
       GetFocusManager()->AdvanceFocus(true);
       View* focused_view = GetFocusManager()->GetFocusedView();
       EXPECT_TRUE(focused_view != NULL);
       if (focused_view)
         EXPECT_EQ(kRightTraversalIDs[j], focused_view->id());
     }
   }
 }
 
 }  // namespace views