summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-24 19:00:55 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-24 19:00:55 +0000
commit345f8e4b5d9e1531e461cce3fd578372779c956a (patch)
tree69c46a93356a4ff180154fda0c050754231eafa1 /chrome/app
parent8a9092a112ccbccd7c20c5c2f40e5e085c59febf (diff)
downloadchromium_src-345f8e4b5d9e1531e461cce3fd578372779c956a.zip
chromium_src-345f8e4b5d9e1531e461cce3fd578372779c956a.tar.gz
chromium_src-345f8e4b5d9e1531e461cce3fd578372779c956a.tar.bz2
Omnibox M5 work, part 1: Security changes
* Remove yellow background * Move lock icon from right side to left side (only on Win) * Change iconography * Change scheme colors * Add label for "Untrusted website" * Remove tooltip on label This also simplifies the LocationBarView code on Windows now that LocationBarImageView is unnecessary, and reorders a few things to try and be in more consistent/physical order. BUG=27570 TEST=Visit various https sites and see that the security icon is on the left, the scheme is colored, and there is no yellow background. Review URL: http://codereview.chromium.org/1056002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42502 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd6
-rw-r--r--chrome/app/theme/theme_resources.grd5
2 files changed, 7 insertions, 4 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index a94816f..ed029e4 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4754,12 +4754,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
Secure connection to <ph name="DOMAIN">$1<ex>paypal.com</ex></ph>
</message>
- <message name="IDS_SECURE_CONNECTION_EV" desc="Short text shown in the location when the connection is secure with an EV cert.">
+ <message name="IDS_SECURE_CONNECTION_EV" desc="Short text shown in the location bar when the connection is secure with an EV cert.">
<ph name="ORGANIZATION">$1<ex>Paypal Inc.</ex></ph> [<ph name="COUNTRY">$2<ex>US</ex></ph>]
</message>
- <message name="IDS_SECURE_CONNECTION_EV_CA" desc="Info popup text showing the certification authority's name when hovering the mouse over the EV label ie., we have a secure connection to the site with an EV cert.">
- Verified by <ph name="ISSUER">$1<ex>VeriSign</ex></ph>
+ <message name="IDS_SECURITY_BROKEN" desc="Short text shown in the location bar when a secure connection cannot be established.">
+ Untrusted website
</message>
<!-- Page Information Window -->
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 9f2482d..a7520a8 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -123,7 +123,10 @@
<include name="IDR_BLOCKED_JAVASCRIPT" file="blocked_javascript.png" type="BINDATA" />
<include name="IDR_BLOCKED_PLUGINS" file="blocked_plugins.png" type="BINDATA" />
<include name="IDR_BLOCKED_POPUPS" file="blocked_popups.png" type="BINDATA" />
- <include name="IDR_LOCK" file="lock_small.png" type="BINDATA" />
+ <include name="IDR_EV_SECURE" file="ev_secure.png" type="BINDATA" />
+ <include name="IDR_SECURE" file="secure.png" type="BINDATA" />
+ <include name="IDR_SECURITY_WARNING" file="security_warning.png" type="BINDATA" />
+ <include name="IDR_SECURITY_ERROR" file="security_error.png" type="BINDATA" />
<include name="IDR_WARNING" file="alert_small.png" type="BINDATA" />
<include name="IDR_STOP" file="stop.png" type="BINDATA" />
<include name="IDR_STOP_NOBORDER" file="stop_noborder.png" type="BINDATA" />