New animation for the origin chip URL showing/hiding.

chrome/browser/ui/toolbar/toolbar_model_impl.cc

 // Copyright 2012 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.
 
 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
@@ skipping 77 matching lines @@
           content::CertStore::GetInstance()->RetrieveCert(ssl.cert_id, NULL))
         return EV_SECURE;
       return SECURE;
     }
     default:
       NOTREACHED();
       return NONE;
   }
 }
 
-// static
-base::string16 ToolbarModelImpl::GetEVCertName(
-    const net::X509Certificate& cert) {
-  // EV are required to have an organization name and country.
-  DCHECK(!cert.subject().organization_names.empty());
-  DCHECK(!cert.subject().country_name.empty());
-
-  return l10n_util::GetStringFUTF16(
-      IDS_SECURE_CONNECTION_EV,
-      base::UTF8ToUTF16(cert.subject().organization_names[0]),
-      base::UTF8ToUTF16(cert.subject().country_name));
-}
-
 // ToolbarModelImpl Implementation.
 base::string16 ToolbarModelImpl::GetText() const {
   base::string16 search_terms(GetSearchTerms(false));
   if (!search_terms.empty())
     return search_terms;
 
   if (WouldOmitURLDueToOriginChip())
     return base::string16();
 
   return GetFormattedURL();
@@ skipping 79 matching lines @@
     IDR_OMNIBOX_HTTPS_VALID,
     IDR_OMNIBOX_HTTPS_WARNING,
     IDR_OMNIBOX_HTTPS_POLICY_WARNING,
     IDR_OMNIBOX_HTTPS_INVALID,
   };
   DCHECK(arraysize(icon_ids) == NUM_SECURITY_LEVELS);
   return icon_ids[level];
 }
 
 base::string16 ToolbarModelImpl::GetEVCertName() const {
-  DCHECK_EQ(EV_SECURE, GetSecurityLevel(false));
-  scoped_refptr<net::X509Certificate> cert;
+  if (GetSecurityLevel(false) != EV_SECURE)
+    return base::string16();
+
   // Note: Navigation controller and active entry are guaranteed non-NULL or
   // the security level would be NONE.
+  scoped_refptr<net::X509Certificate> cert;
   content::CertStore::GetInstance()->RetrieveCert(
       GetNavigationController()->GetVisibleEntry()->GetSSL().cert_id, &cert);
-  return GetEVCertName(*cert.get());
+
+  // EV are required to have an organization name and country.
+  DCHECK(!cert->subject().organization_names.empty());
+  DCHECK(!cert->subject().country_name.empty());
+  return l10n_util::GetStringFUTF16(
+      IDS_SECURE_CONNECTION_EV,
+      base::UTF8ToUTF16(cert->subject().organization_names[0]),
+      base::UTF8ToUTF16(cert->subject().country_name));
 }
 
 bool ToolbarModelImpl::ShouldDisplayURL() const {
   // Note: The order here is important.
   // - The WebUI test must come before the extension scheme test because there
   //   can be WebUIs that have extension schemes (e.g. the bookmark manager). In
   //   that case, we should prefer what the WebUI instance says.
   // - The view-source test must come before the NTP test because of the case
   //   of view-source:chrome://newtab, which should display its URL despite what
   //   chrome://newtab says.
@@ skipping 103 matching lines @@
   if (entry &&
       google_util::StartsWithCommandLineGoogleBaseURL(entry->GetVirtualURL()))
     return search_terms;
 
   // Otherwise, extract search terms for HTTPS pages that do not have a security
   // error.
   ToolbarModel::SecurityLevel security_level = GetSecurityLevel(ignore_editing);
   return ((security_level == NONE) || (security_level == SECURITY_ERROR)) ?
       base::string16() : search_terms;
 }