Expand SecurityStyleChanged interfaces to include explanations

chrome/browser/ui/browser.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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // defined(OS_WIN)
@@ skipping 1286 matching lines @@
                            blink::WebDragOperationsMask operations_allowed) {
   // Disallow drag-and-drop navigation for Settings windows which do not support
   // external navigation.
   if ((operations_allowed & blink::WebDragOperationLink) &&
       chrome::SettingsWindowManager::GetInstance()->IsSettingsBrowser(this)) {
     return false;
   }
   return true;
 }
 
-content::SecurityStyle Browser::GetSecurityStyle(WebContents* web_contents) {
-  return connection_security::GetSecurityStyleForWebContents(web_contents);
+content::SecurityStyle Browser::GetSecurityStyle(
+    WebContents* web_contents,
+    content::SecurityStyleExplanation* security_style_explanation) {
+  connection_security::SecurityInfo security_info;
+  connection_security::GetSecurityInfoForWebContents(web_contents,
+                                                     &security_info);
+
+  if (security_info.security_style == content::SECURITY_STYLE_UNKNOWN)
+    return security_info.security_style;
+
+  if (security_info.sha1_deprecation_status ==
+      connection_security::DEPRECATED_SHA1_BROKEN) {
+    security_style_explanation->broken_explanations.push_back(
+        content::SecurityStyleProperty(
+            l10n_util::GetStringUTF8(IDS_BROKEN_SHA1),
+            l10n_util::GetStringUTF8(IDS_BROKEN_SHA1_DESCRIPTION)));
+  } else if (security_info.sha1_deprecation_status ==
+             connection_security::DEPRECATED_SHA1_WARNING) {
+    security_style_explanation->warning_explanations.push_back(
+        content::SecurityStyleProperty(
+            l10n_util::GetStringUTF8(IDS_WARNING_SHA1),
+            l10n_util::GetStringUTF8(IDS_WARNING_SHA1_DESCRIPTION)));
+  }
+
+  if (security_info.mixed_content_status ==
+      connection_security::RAN_MIXED_CONTENT) {
+    security_style_explanation->broken_explanations.push_back(
+        content::SecurityStyleProperty(
+            l10n_util::GetStringUTF8(IDS_ACTIVE_MIXED_CONTENT),
+            l10n_util::GetStringUTF8(IDS_ACTIVE_MIXED_CONTENT_DESCRIPTION)));
+  } else if (security_info.mixed_content_status ==
+             connection_security::DISPLAYED_MIXED_CONTENT) {
+    security_style_explanation->warning_explanations.push_back(
+        content::SecurityStyleProperty(
+            l10n_util::GetStringUTF8(IDS_PASSIVE_MIXED_CONTENT),
+            l10n_util::GetStringUTF8(IDS_PASSIVE_MIXED_CONTENT_DESCRIPTION)));
+  }
+
+  if (net::IsCertStatusError(security_info.cert_status)) {
+    base::string16 error_string = base::UTF8ToUTF16(net::ErrorToString(
+        net::MapCertStatusToNetError(security_info.cert_status)));
+
+    content::SecurityStyleProperty explanation(
+        l10n_util::GetStringUTF8(IDS_CERTIFICATE_CHAIN_ERROR),
+        l10n_util::GetStringFUTF8(
+            IDS_CERTIFICATE_CHAIN_ERROR_DESCRIPTION_FORMAT,
+            error_string)
+
+    if (net::IsCertStatusMinorError(security_info.cert_status)) {

[Peter Kasting, 2015/06/16 06:29:11]

Nit: No {}

[estark, 2015/06/16 15:32:35]

Done.

+      security_style_explanation->warning_explanations.push_back(explanation);
+    } else {
+      security_style_explanation->broken_explanations.push_back(explanation);
+    }
+  }
+
+  return security_info.security_style;
 }
 
 bool Browser::IsMouseLocked() const {
   return exclusive_access_manager_->mouse_lock_controller()->IsMouseLocked();
 }
 
 void Browser::OnWindowDidShow() {
   if (window_has_shown_)
     return;
   window_has_shown_ = true;
@@ skipping 1305 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         ui::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }