summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/bookmarks/recently_used_folders_combo_model.cc4
-rw-r--r--chrome/browser/bookmarks/recently_used_folders_combo_model.h4
-rw-r--r--chrome/browser/chromeos/options/vpn_config_view.cc26
-rw-r--r--chrome/browser/chromeos/options/wifi_config_view.cc41
-rw-r--r--chrome/browser/ui/views/cookie_info_view.cc2
-rw-r--r--chrome/browser/ui/views/cookie_info_view.h2
-rw-r--r--chrome/browser/ui/views/uninstall_view.cc4
-rw-r--r--chrome/browser/ui/views/uninstall_view.h4
8 files changed, 54 insertions, 33 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|.
diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc
index 4f657b5..bf8f30f 100644
--- a/chrome/browser/chromeos/options/vpn_config_view.cc
+++ b/chrome/browser/chromeos/options/vpn_config_view.cc
@@ -56,13 +56,16 @@ class ProviderTypeComboboxModel : public ui::ComboboxModel {
public:
ProviderTypeComboboxModel() {}
virtual ~ProviderTypeComboboxModel() {}
- virtual int GetItemCount() {
+
+ // Overridden from ui::ComboboxModel:
+ virtual int GetItemCount() const OVERRIDE {
return chromeos::PROVIDER_TYPE_MAX;
}
- virtual string16 GetItemAt(int index) {
+ virtual string16 GetItemAt(int index) OVERRIDE {
ProviderType type = static_cast<ProviderType>(index);
return ProviderTypeToString(type);
}
+
private:
DISALLOW_COPY_AND_ASSIGN(ProviderTypeComboboxModel);
};
@@ -73,25 +76,28 @@ class ServerCACertComboboxModel : public ui::ComboboxModel {
: cert_library_(cert_library) {
}
virtual ~ServerCACertComboboxModel() {}
- virtual int GetItemCount() {
+
+ // Overridden from ui::ComboboxModel:
+ virtual int GetItemCount() const OVERRIDE {
if (cert_library_->CertificatesLoading())
return 1; // "Loading"
// "Default" + certs.
return cert_library_->GetCACertificates().Size() + 1;
}
- virtual string16 GetItemAt(int combo_index) {
+ virtual string16 GetItemAt(int index) OVERRIDE {
if (cert_library_->CertificatesLoading())
return l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
- if (combo_index == 0)
+ if (index == 0)
return l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_SERVER_CA_DEFAULT);
- int cert_index = combo_index - 1;
+ int cert_index = index - 1;
return cert_library_->GetCACertificates().GetDisplayStringAt(cert_index);
}
private:
CertLibrary* cert_library_;
+
DISALLOW_COPY_AND_ASSIGN(ServerCACertComboboxModel);
};
@@ -101,7 +107,9 @@ class UserCertComboboxModel : public ui::ComboboxModel {
: cert_library_(cert_library) {
}
virtual ~UserCertComboboxModel() {}
- virtual int GetItemCount() {
+
+ // Overridden from ui::ComboboxModel:
+ virtual int GetItemCount() const OVERRIDE {
if (cert_library_->CertificatesLoading())
return 1; // "Loading"
int num_certs = cert_library_->GetUserCertificates().Size();
@@ -109,7 +117,7 @@ class UserCertComboboxModel : public ui::ComboboxModel {
return 1; // "None installed"
return num_certs;
}
- virtual string16 GetItemAt(int combo_index) {
+ virtual string16 GetItemAt(int index) OVERRIDE {
if (cert_library_->CertificatesLoading()) {
return l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
@@ -118,7 +126,7 @@ class UserCertComboboxModel : public ui::ComboboxModel {
return l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_USER_CERT_NONE_INSTALLED);
}
- return cert_library_->GetUserCertificates().GetDisplayStringAt(combo_index);
+ return cert_library_->GetUserCertificates().GetDisplayStringAt(index);
}
private:
diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc
index 08ed40a..9a5b828 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.cc
+++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -45,10 +45,12 @@ class SecurityComboboxModel : public ui::ComboboxModel {
public:
SecurityComboboxModel() {}
virtual ~SecurityComboboxModel() {}
- virtual int GetItemCount() {
+
+ // Overridden from ui::ComboboxModel:
+ virtual int GetItemCount() const OVERRIDE {
return SECURITY_INDEX_COUNT;
}
- virtual string16 GetItemAt(int index) {
+ virtual string16 GetItemAt(int index) OVERRIDE {
if (index == SECURITY_INDEX_NONE)
return l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_NONE);
@@ -61,6 +63,7 @@ class SecurityComboboxModel : public ui::ComboboxModel {
NOTREACHED();
return string16();
}
+
private:
DISALLOW_COPY_AND_ASSIGN(SecurityComboboxModel);
};
@@ -79,10 +82,12 @@ class EAPMethodComboboxModel : public ui::ComboboxModel {
public:
EAPMethodComboboxModel() {}
virtual ~EAPMethodComboboxModel() {}
- virtual int GetItemCount() {
+
+ // Overridden from ui::ComboboxModel:
+ virtual int GetItemCount() const OVERRIDE {
return EAP_METHOD_INDEX_COUNT;
}
- virtual string16 GetItemAt(int index) {
+ virtual string16 GetItemAt(int index) OVERRIDE {
if (index == EAP_METHOD_INDEX_NONE)
return l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_EAP_METHOD_NONE);
@@ -121,7 +126,9 @@ class Phase2AuthComboboxModel : public ui::ComboboxModel {
explicit Phase2AuthComboboxModel(views::Combobox* eap_method_combobox)
: eap_method_combobox_(eap_method_combobox) {}
virtual ~Phase2AuthComboboxModel() {}
- virtual int GetItemCount() {
+
+ // Overridden from ui::ComboboxModel:
+ virtual int GetItemCount() const OVERRIDE {
switch (eap_method_combobox_->selected_item()) {
case EAP_METHOD_INDEX_NONE:
case EAP_METHOD_INDEX_TLS:
@@ -135,7 +142,7 @@ class Phase2AuthComboboxModel : public ui::ComboboxModel {
NOTREACHED();
return 0;
}
- virtual string16 GetItemAt(int index) {
+ virtual string16 GetItemAt(int index) OVERRIDE {
if (index == PHASE_2_AUTH_INDEX_AUTO)
return l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PHASE_2_AUTH_AUTO);
@@ -160,6 +167,7 @@ class Phase2AuthComboboxModel : public ui::ComboboxModel {
private:
views::Combobox* eap_method_combobox_;
+
DISALLOW_COPY_AND_ASSIGN(Phase2AuthComboboxModel);
};
@@ -189,23 +197,25 @@ class ServerCACertComboboxModel : public ui::ComboboxModel {
DCHECK(cert_library);
}
virtual ~ServerCACertComboboxModel() {}
- virtual int GetItemCount() {
+
+ // Overridden from ui::ComboboxModel:
+ virtual int GetItemCount() const OVERRIDE {
if (cert_library_->CertificatesLoading())
return 1; // "Loading"
// First "Default", then the certs, then "Do not check".
return cert_library_->GetCACertificates().Size() + 2;
}
- virtual string16 GetItemAt(int combo_index) {
+ virtual string16 GetItemAt(int index) OVERRIDE {
if (cert_library_->CertificatesLoading())
return l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
- if (combo_index == 0)
+ if (index == 0)
return l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_SERVER_CA_DEFAULT);
- if (combo_index == GetItemCount() - 1)
+ if (index == GetItemCount() - 1)
return l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_SERVER_CA_DO_NOT_CHECK);
- int cert_index = combo_index - 1;
+ int cert_index = index - 1;
return cert_library_->GetCACertificates().GetDisplayStringAt(cert_index);
}
@@ -221,7 +231,9 @@ class UserCertComboboxModel : public ui::ComboboxModel {
DCHECK(cert_library);
}
virtual ~UserCertComboboxModel() {}
- virtual int GetItemCount() {
+
+ // Overridden from ui::ComboboxModel:
+ virtual int GetItemCount() const OVERRIDE {
if (cert_library_->CertificatesLoading())
return 1; // "Loading"
int num_certs = cert_library_->GetUserCertificates().Size();
@@ -229,18 +241,19 @@ class UserCertComboboxModel : public ui::ComboboxModel {
return 1; // "None installed"
return num_certs;
}
- virtual string16 GetItemAt(int combo_index) {
+ virtual string16 GetItemAt(int index) OVERRIDE {
if (cert_library_->CertificatesLoading())
return l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
if (cert_library_->GetUserCertificates().Size() == 0)
return l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_USER_CERT_NONE_INSTALLED);
- return cert_library_->GetUserCertificates().GetDisplayStringAt(combo_index);
+ return cert_library_->GetUserCertificates().GetDisplayStringAt(index);
}
private:
CertLibrary* cert_library_;
+
DISALLOW_COPY_AND_ASSIGN(UserCertComboboxModel);
};
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:
generated by cgit v1.1 at 2025-02-07 09:33:55 +0000