diff options
-rw-r--r-- | chrome/app/generated_resources.grd | 2 | ||||
-rw-r--r-- | chrome/browser/tab_contents/insecure_content_infobar_delegate.cc | 7 | ||||
-rw-r--r-- | chrome/browser/tab_contents/insecure_content_infobar_delegate.h | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index e0cb65b..5b952f7 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4525,7 +4525,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Insecure script has been blocked. </message> <message name="IDS_ALLOW_INSECURE_CONTENT_BUTTON" desc="Button to allow insecure content to be displayed"> - Load anyway + Load anyway (not recommended) </message> <if expr="pp_ifdef('chromeos')"> diff --git a/chrome/browser/tab_contents/insecure_content_infobar_delegate.cc b/chrome/browser/tab_contents/insecure_content_infobar_delegate.cc index 0f19c93..4022a76 100644 --- a/chrome/browser/tab_contents/insecure_content_infobar_delegate.cc +++ b/chrome/browser/tab_contents/insecure_content_infobar_delegate.cc @@ -43,10 +43,15 @@ string16 InsecureContentInfoBarDelegate::GetMessageText() const { IDS_BLOCKED_RUNNING_INSECURE_CONTENT); } +int InsecureContentInfoBarDelegate::GetButtons() const { + return BUTTON_OK; +} + string16 InsecureContentInfoBarDelegate::GetButtonLabel( InfoBarButton button) const { + DCHECK_EQ(button, BUTTON_OK); return l10n_util::GetStringUTF16(IDS_ALLOW_INSECURE_CONTENT_BUTTON); -}; +} bool InsecureContentInfoBarDelegate::Accept() { UMA_HISTOGRAM_ENUMERATION("InsecureContentInfoBarDelegate", diff --git a/chrome/browser/tab_contents/insecure_content_infobar_delegate.h b/chrome/browser/tab_contents/insecure_content_infobar_delegate.h index 3d2c908..069eb3e 100644 --- a/chrome/browser/tab_contents/insecure_content_infobar_delegate.h +++ b/chrome/browser/tab_contents/insecure_content_infobar_delegate.h @@ -41,6 +41,7 @@ class InsecureContentInfoBarDelegate : public ConfirmInfoBarDelegate { virtual InsecureContentInfoBarDelegate* AsInsecureContentInfoBarDelegate() OVERRIDE; virtual string16 GetMessageText() const; + virtual int GetButtons() const OVERRIDE; virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE; virtual bool Accept() OVERRIDE; virtual string16 GetLinkText() const OVERRIDE; |