New location security strings and animation.

components/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 "components/toolbar/toolbar_model_impl.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
@@ skipping 124 matching lines @@
 
   // 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));
 }
 
+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();
 
   return delegate_->GetSearchTerms(GetSecurityLevel(ignore_editing));
 }