summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-24 00:32:52 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-24 00:32:52 +0000
commit8f28ba3b385262689ba66cf4e838a32ac6272914 (patch)
tree5a26cd818a31edee250df321adeb4d1b83b3cee5 /chrome/browser
parent230ebaff29f2e59c2f82ac22970d63e787217d5d (diff)
downloadchromium_src-8f28ba3b385262689ba66cf4e838a32ac6272914.zip
chromium_src-8f28ba3b385262689ba66cf4e838a32ac6272914.tar.gz
chromium_src-8f28ba3b385262689ba66cf4e838a32ac6272914.tar.bz2
Make ConfirmInfoBarDelegate::GetLinkText() const.
BUG=none TEST=none Review URL: http://codereview.chromium.org/7236017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/autofill/autofill_cc_infobar_delegate.cc2
-rw-r--r--chrome/browser/autofill/autofill_cc_infobar_delegate.h2
-rw-r--r--chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.cc2
-rw-r--r--chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h2
-rw-r--r--chrome/browser/geolocation/chrome_geolocation_permission_context.cc4
-rw-r--r--chrome/browser/plugin_installer_infobar_delegate.cc2
-rw-r--r--chrome/browser/plugin_installer_infobar_delegate.h2
-rw-r--r--chrome/browser/plugin_observer.cc6
-rw-r--r--chrome/browser/tab_contents/confirm_infobar_delegate.cc2
-rw-r--r--chrome/browser/tab_contents/confirm_infobar_delegate.h2
-rw-r--r--chrome/browser/tab_contents/insecure_content_infobar_delegate.cc2
-rw-r--r--chrome/browser/tab_contents/insecure_content_infobar_delegate.h2
-rw-r--r--chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc2
-rw-r--r--chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h2
14 files changed, 17 insertions, 17 deletions
diff --git a/chrome/browser/autofill/autofill_cc_infobar_delegate.cc b/chrome/browser/autofill/autofill_cc_infobar_delegate.cc
index 79988bf..a58b610 100644
--- a/chrome/browser/autofill/autofill_cc_infobar_delegate.cc
+++ b/chrome/browser/autofill/autofill_cc_infobar_delegate.cc
@@ -81,7 +81,7 @@ bool AutofillCCInfoBarDelegate::Cancel() {
return true;
}
-string16 AutofillCCInfoBarDelegate::GetLinkText() {
+string16 AutofillCCInfoBarDelegate::GetLinkText() const {
return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
}
diff --git a/chrome/browser/autofill/autofill_cc_infobar_delegate.h b/chrome/browser/autofill/autofill_cc_infobar_delegate.h
index 6d0b9e1..f534631 100644
--- a/chrome/browser/autofill/autofill_cc_infobar_delegate.h
+++ b/chrome/browser/autofill/autofill_cc_infobar_delegate.h
@@ -46,7 +46,7 @@ class AutofillCCInfoBarDelegate : public ConfirmInfoBarDelegate {
virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
virtual bool Accept() OVERRIDE;
virtual bool Cancel() OVERRIDE;
- virtual string16 GetLinkText() OVERRIDE;
+ virtual string16 GetLinkText() const OVERRIDE;
virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
// The credit card that should be saved if the user accepts the infobar.
diff --git a/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.cc b/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.cc
index f0968d1..0fa1a35 100644
--- a/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.cc
+++ b/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.cc
@@ -61,7 +61,7 @@ bool RegisterProtocolHandlerInfoBarDelegate::Cancel() {
return true;
}
-string16 RegisterProtocolHandlerInfoBarDelegate::GetLinkText() {
+string16 RegisterProtocolHandlerInfoBarDelegate::GetLinkText() const {
// TODO(koz): Make this a 'learn more' link.
return string16();
}
diff --git a/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h b/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h
index 756a922..d194a86 100644
--- a/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h
+++ b/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h
@@ -29,7 +29,7 @@ class RegisterProtocolHandlerInfoBarDelegate : public ConfirmInfoBarDelegate {
virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
virtual bool Accept() OVERRIDE;
virtual bool Cancel() OVERRIDE;
- virtual string16 GetLinkText() OVERRIDE;
+ virtual string16 GetLinkText() const OVERRIDE;
virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
private:
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
index 8b8a455..389a7fd 100644
--- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
@@ -130,7 +130,7 @@ class GeolocationConfirmInfoBarDelegate : public ConfirmInfoBarDelegate {
virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
virtual bool Accept() OVERRIDE;
virtual bool Cancel() OVERRIDE;
- virtual string16 GetLinkText() OVERRIDE;
+ virtual string16 GetLinkText() const OVERRIDE;
virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
TabContents* tab_contents_;
@@ -200,7 +200,7 @@ bool GeolocationConfirmInfoBarDelegate::Cancel() {
return true;
}
-string16 GeolocationConfirmInfoBarDelegate::GetLinkText() {
+string16 GeolocationConfirmInfoBarDelegate::GetLinkText() const {
return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
}
diff --git a/chrome/browser/plugin_installer_infobar_delegate.cc b/chrome/browser/plugin_installer_infobar_delegate.cc
index 783d562..c860137 100644
--- a/chrome/browser/plugin_installer_infobar_delegate.cc
+++ b/chrome/browser/plugin_installer_infobar_delegate.cc
@@ -52,7 +52,7 @@ bool PluginInstallerInfoBarDelegate::Accept() {
return true;
}
-string16 PluginInstallerInfoBarDelegate::GetLinkText() {
+string16 PluginInstallerInfoBarDelegate::GetLinkText() const {
return l10n_util::GetStringUTF16(IDS_PLUGININSTALLER_PROBLEMSINSTALLING);
}
diff --git a/chrome/browser/plugin_installer_infobar_delegate.h b/chrome/browser/plugin_installer_infobar_delegate.h
index d4065d5..6831a2f 100644
--- a/chrome/browser/plugin_installer_infobar_delegate.h
+++ b/chrome/browser/plugin_installer_infobar_delegate.h
@@ -27,7 +27,7 @@ class PluginInstallerInfoBarDelegate : public ConfirmInfoBarDelegate {
virtual int GetButtons() const OVERRIDE;
virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
virtual bool Accept() OVERRIDE;
- virtual string16 GetLinkText() OVERRIDE;
+ virtual string16 GetLinkText() const OVERRIDE;
virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
// The containing TabContents
diff --git a/chrome/browser/plugin_observer.cc b/chrome/browser/plugin_observer.cc
index 6151f7e..7983b9d2 100644
--- a/chrome/browser/plugin_observer.cc
+++ b/chrome/browser/plugin_observer.cc
@@ -48,8 +48,8 @@ class PluginInfoBarDelegate : public ConfirmInfoBarDelegate {
private:
// ConfirmInfoBarDelegate:
- virtual gfx::Image* GetIcon() const;
- virtual string16 GetLinkText();
+ virtual gfx::Image* GetIcon() const OVERRIDE;
+ virtual string16 GetLinkText() const OVERRIDE;
DISALLOW_COPY_AND_ASSIGN(PluginInfoBarDelegate);
};
@@ -83,7 +83,7 @@ gfx::Image* PluginInfoBarDelegate::GetIcon() const {
IDR_INFOBAR_PLUGIN_INSTALL);
}
-string16 PluginInfoBarDelegate::GetLinkText() {
+string16 PluginInfoBarDelegate::GetLinkText() const {
return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
}
diff --git a/chrome/browser/tab_contents/confirm_infobar_delegate.cc b/chrome/browser/tab_contents/confirm_infobar_delegate.cc
index 1299065..fa35c4d 100644
--- a/chrome/browser/tab_contents/confirm_infobar_delegate.cc
+++ b/chrome/browser/tab_contents/confirm_infobar_delegate.cc
@@ -29,7 +29,7 @@ bool ConfirmInfoBarDelegate::Cancel() {
return true;
}
-string16 ConfirmInfoBarDelegate::GetLinkText() {
+string16 ConfirmInfoBarDelegate::GetLinkText() const {
return string16();
}
diff --git a/chrome/browser/tab_contents/confirm_infobar_delegate.h b/chrome/browser/tab_contents/confirm_infobar_delegate.h
index 76e2ade..7c5cb4e 100644
--- a/chrome/browser/tab_contents/confirm_infobar_delegate.h
+++ b/chrome/browser/tab_contents/confirm_infobar_delegate.h
@@ -45,7 +45,7 @@ class ConfirmInfoBarDelegate : public InfoBarDelegate {
// Returns the text of the link to be displayed, if any. Otherwise returns
// and empty string.
- virtual string16 GetLinkText();
+ virtual string16 GetLinkText() const;
// Called when the Link is clicked. The |disposition| specifies how the
// resulting document should be loaded (based on the event flags present when
diff --git a/chrome/browser/tab_contents/insecure_content_infobar_delegate.cc b/chrome/browser/tab_contents/insecure_content_infobar_delegate.cc
index daa1bb6..0f19c93 100644
--- a/chrome/browser/tab_contents/insecure_content_infobar_delegate.cc
+++ b/chrome/browser/tab_contents/insecure_content_infobar_delegate.cc
@@ -60,7 +60,7 @@ bool InsecureContentInfoBarDelegate::Accept() {
return true;
}
-string16 InsecureContentInfoBarDelegate::GetLinkText() {
+string16 InsecureContentInfoBarDelegate::GetLinkText() const {
return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
}
diff --git a/chrome/browser/tab_contents/insecure_content_infobar_delegate.h b/chrome/browser/tab_contents/insecure_content_infobar_delegate.h
index 38207f0..3d2c908 100644
--- a/chrome/browser/tab_contents/insecure_content_infobar_delegate.h
+++ b/chrome/browser/tab_contents/insecure_content_infobar_delegate.h
@@ -43,7 +43,7 @@ class InsecureContentInfoBarDelegate : public ConfirmInfoBarDelegate {
virtual string16 GetMessageText() const;
virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
virtual bool Accept() OVERRIDE;
- virtual string16 GetLinkText() OVERRIDE;
+ virtual string16 GetLinkText() const OVERRIDE;
virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
TabContentsWrapper* tab_contents_;
diff --git a/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc b/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc
index 25df444..11577fc 100644
--- a/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc
+++ b/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc
@@ -51,7 +51,7 @@ bool MockConfirmInfoBarDelegate::Cancel() {
return closes_on_action_;
}
-string16 MockConfirmInfoBarDelegate::GetLinkText() {
+string16 MockConfirmInfoBarDelegate::GetLinkText() const {
link_text_accessed_ = true;
return string16();
}
diff --git a/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h b/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h
index f392b0c..8fb5fe7 100644
--- a/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h
+++ b/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h
@@ -44,7 +44,7 @@ class MockConfirmInfoBarDelegate : public ConfirmInfoBarDelegate {
virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
virtual bool Accept() OVERRIDE;
virtual bool Cancel() OVERRIDE;
- virtual string16 GetLinkText() OVERRIDE;
+ virtual string16 GetLinkText() const OVERRIDE;
virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
Owner* owner_;