New location security strings and animation.

components/toolbar/toolbar_model_impl.cc

Index: components/toolbar/toolbar_model_impl.cc
diff --git a/components/toolbar/toolbar_model_impl.cc b/components/toolbar/toolbar_model_impl.cc
index f6c7410c5e0209710216d766ff20d1a8a657cad0..57a1527355ccbd4933a20ecab3db9f2d4e844a19 100644
--- a/components/toolbar/toolbar_model_impl.cc
+++ b/components/toolbar/toolbar_model_impl.cc
@@ -142,10 +142,28 @@ base::string16 ToolbarModelImpl::GetEVCertName() const {
       base::UTF8ToUTF16(cert->subject().country_name));
 }
 
+base::string16 ToolbarModelImpl::GetSecureVerboseText() const {
+  switch (GetSecurityLevel(false)) {
+    case SecurityStateModel::SECURE:
+      return l10n_util::GetStringUTF16(IDS_SECURE_VERBOSE_STATE);
+    case SecurityStateModel::SECURITY_ERROR:
+      return l10n_util::GetStringUTF16(IDS_NOT_SECURE_VERBOSE_STATE);
+    default:
+      return base::string16();
+  }
+
+  NOTREACHED();

[Peter Kasting, 2016/08/20 01:16:43]

This block is unreachable and can trigger warnings on Windows.  Simplest fix is
to entirely remove this.

[Kevin Bailey, 2016/08/22 15:58:57]

Done.

+  return base::string16();
+}
+
 bool ToolbarModelImpl::ShouldDisplayURL() const {
   return delegate_->ShouldDisplayURL();
 }
 
+scoped_refptr<net::X509Certificate> ToolbarModelImpl::GetCertificate() const {
+  return delegate_->GetCertificate();
+}
+
 base::string16 ToolbarModelImpl::GetSearchTerms(bool ignore_editing) const {
   if (!url_replacement_enabled() || (input_in_progress() && !ignore_editing))
     return base::string16();