diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-27 00:36:31 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-27 00:36:31 +0000 |
| commit | 1957e5c792a5e72799f4a7a98c8994aa7f16f276 (patch) | |
| tree | 7ccb830e7031ac40d815856794b74b5c9cad4edb /chrome/browser/bookmarks | |
| parent | 36ed39d3e18c4acdf062c10af072253581cbbd0c (diff) | |
| download | chromium_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 'chrome/browser/bookmarks')
| -rw-r--r-- | chrome/browser/bookmarks/recently_used_folders_combo_model.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/bookmarks/recently_used_folders_combo_model.h | 4 |
2 files changed, 4 insertions, 4 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|. |