Change wording and appearance of insecure script infobar.

Change wording and appearance of insecure script infobar.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=89348

[Tom Sepez, 2011-06-15 17:56:54]

Please review. Thanks.

[cevans, 2011-06-15 17:57:52]

(I'm not an OWNER but FWIW, this new text has sign off from UI leads)

On Wed, Jun 15, 2011 at 10:56 AM, <tsepez@chromium.org> wrote:

> Reviewers: Avi, cevans,
>
> Message:
> Please review. Thanks.
>
> Description:
> Change wording and appearance of insecure script infobar.
>
> Please review this at
http://codereview.chromium.**org/7097014/<http://codereview.chromium.org/7097...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src/<http://svn.chromium.org/chrome/trunk/src/>
>
> Affected files:
>  M     chrome/app/generated_**resources.grd
>  M     chrome/browser/tab_contents/**blocked_infobar_delegate.cc
>
>
> Index: chrome/app/generated_**resources.grd
> ==============================**==============================**=======
> --- chrome/app/generated_**resources.grd  (revision 89021)
> +++ chrome/app/generated_**resources.grd  (working copy)
> @@ -4473,13 +4473,13 @@
>
>       <!-- Blocked Displaying/Running Insecure Content info bar -->
>       <message name="IDS_BLOCKED_DISPLAYING_**INSECURE_CONTENT"
> desc="Message shown when a website has asked chrome to display mixed
> content.  The message is followed by a learn more link and an allow
> button.">
> -        Some displayable content on this website is insecure, and has been
> blocked for your safety.
> +        Insecure content has been blocked.
>       </message>
>       <message name="IDS_BLOCKED_RUNNING_**INSECURE_CONTENT" desc="Message
> shown when a website has asked chrome to run active mixed content.  The
> message is followed by a learn more link and an allow button.">
> -        Some script content on this website is insecure, and has been
> blocked for your safety.
> +        Insecure script has been blocked.
>       </message>
>       <message name="IDS_ALLOW_INSECURE_**CONTENT_BUTTON" desc="Button to
> allow insecure content to be displayed">
> -        Load anyway (not recommended)
> +        Load Anyway
>       </message>
>       <if expr="pp_ifdef('chromeos')">
>         <!-- Locale Change Notification-->
> Index: chrome/browser/tab_contents/**blocked_infobar_delegate.cc
> ==============================**==============================**=======
> --- chrome/browser/tab_contents/**blocked_infobar_delegate.cc
> (revision 89021)
> +++ chrome/browser/tab_contents/**blocked_infobar_delegate.cc     (working
> copy)
> @@ -49,10 +49,13 @@
>  }
>
>  int BlockedInfoBarDelegate::**GetButtons() const {
> -  return BUTTON_OK;
> +  return BUTTON_OK | BUTTON_CANCEL;
>  }
>
>  string16 BlockedInfoBarDelegate::**GetButtonLabel(InfoBarButton button)
> const {
> +  if (button == BUTTON_CANCEL)
> +    return l10n_util::GetStringUTF16(IDS_**OK);
> +
>   DCHECK_EQ(button, BUTTON_OK);
>   return l10n_util::GetStringUTF16(**button_resource_id_);
>  };
>
>
>

[Avi (use Gerrit), 2011-06-15 18:52:41]

LGTM