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

1 files changed, 6 insertions, 21 deletions

diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc
index c1350e4..7683221 100644
--- a/chrome/browser/ssl/ssl_manager.cc
+++ b/chrome/browser/ssl/ssl_manager.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -271,30 +271,15 @@ bool SSLManager::DeserializeSecurityInfo(const std::string& state,
 }
 
 // static
-bool SSLManager::GetEVCertNames(const net::X509Certificate& cert,
-                                std::wstring* short_name,
-                                std::wstring* ca_name) {
-  DCHECK(short_name || ca_name);
-
+std::wstring SSLManager::GetEVCertName(const net::X509Certificate& cert) {
   // EV are required to have an organization name and country.
   if (cert.subject().organization_names.empty() ||
       cert.subject().country_name.empty()) {
     NOTREACHED();
-    return false;
+    return std::wstring();
   }
 
-  if (short_name) {
-    *short_name = l10n_util::GetStringF(
-        IDS_SECURE_CONNECTION_EV,
-        UTF8ToWide(cert.subject().organization_names[0]),
-        UTF8ToWide(cert.subject().country_name));
-  }
-
-  if (ca_name) {
-    // TODO(wtc): should we show the root CA's name instead?
-    *ca_name = l10n_util::GetStringF(
-        IDS_SECURE_CONNECTION_EV_CA,
-        UTF8ToWide(cert.issuer().organization_names[0]));
-  }
-  return true;
+  return l10n_util::GetStringF(IDS_SECURE_CONNECTION_EV,
+                               UTF8ToWide(cert.subject().organization_names[0]),
+                               UTF8ToWide(cert.subject().country_name));
 }