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/ui/views | |
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/ui/views')
-rw-r--r-- | chrome/browser/ui/views/cookie_info_view.cc | 2 | ||||
-rw-r--r-- | chrome/browser/ui/views/cookie_info_view.h | 2 | ||||
-rw-r--r-- | chrome/browser/ui/views/uninstall_view.cc | 4 | ||||
-rw-r--r-- | chrome/browser/ui/views/uninstall_view.h | 4 |
4 files changed, 6 insertions, 6 deletions
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: |