Toolbar: Report offline state through icon and verbose text.

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 61 matching lines @@
              ? security_state::NONE
              : delegate_->GetSecurityLevel();
 }
 
 const gfx::VectorIcon& ToolbarModelImpl::GetVectorIcon() const {
 #if (!defined(OS_ANDROID) || BUILDFLAG(ENABLE_VR)) && !defined(OS_IOS)
   auto* const icon_override = delegate_->GetVectorIconOverride();
   if (icon_override)
     return *icon_override;
 
+  if (IsOfflinePage())

[cjgrant, 2017/07/06 19:19:16]

I assume we want this check after the override above.  That same override could
actually supply the icon, but I think it's more correct to do here.

+    return toolbar::kOfflinePinIcon;
+
   switch (GetSecurityLevel(false)) {
     case security_state::NONE:
     case security_state::HTTP_SHOW_WARNING:
       return toolbar::kHttpIcon;
     case security_state::EV_SECURE:
     case security_state::SECURE:
       return toolbar::kHttpsValidIcon;
     case security_state::SECURITY_WARNING:
       // Surface Dubious as Neutral.
       return toolbar::kHttpIcon;
@@ skipping 22 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 {
+  if (IsOfflinePage())
+    return l10n_util::GetStringUTF16(IDS_OFFLINE_VERBOSE_STATE);
+
   switch (GetSecurityLevel(false)) {
     case security_state::HTTP_SHOW_WARNING:
       return l10n_util::GetStringUTF16(IDS_NOT_SECURE_VERBOSE_STATE);
     case security_state::SECURE:
       return l10n_util::GetStringUTF16(IDS_SECURE_VERBOSE_STATE);
     case security_state::DANGEROUS:
       return l10n_util::GetStringUTF16(delegate_->FailsMalwareCheck()
                                            ? IDS_DANGEROUS_VERBOSE_STATE
                                            : IDS_NOT_SECURE_VERBOSE_STATE);
     default:
       return base::string16();
   }
 }
 
 bool ToolbarModelImpl::ShouldDisplayURL() const {
   return delegate_->ShouldDisplayURL();
 }
 
 bool ToolbarModelImpl::IsOfflinePage() const {
   return delegate_->IsOfflinePage();
 }