summaryrefslogtreecommitdiffstats
path: root/ui/views/focus
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-27 00:36:31 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-27 00:36:31 +0000
commit1957e5c792a5e72799f4a7a98c8994aa7f16f276 (patch)
tree7ccb830e7031ac40d815856794b74b5c9cad4edb /ui/views/focus
parent36ed39d3e18c4acdf062c10af072253581cbbd0c (diff)
downloadchromium_src-1957e5c792a5e72799f4a7a98c8994aa7f16f276.zip
chromium_src-1957e5c792a5e72799f4a7a98c8994aa7f16f276.tar.gz
chromium_src-1957e5c792a5e72799f4a7a98c8994aa7f16f276.tar.bz2
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
Diffstat (limited to 'ui/views/focus')
-rw-r--r--ui/views/focus/focus_traversal_unittest.cc8
1 files changed, 4 insertions, 4 deletions
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);
}
};