Commit 495bb023 authored by Livvie Lin's avatar Livvie Lin Committed by Commit Bot

Use grey triangle icon for HTTP when experiment enabled

Bug: 1008218
Change-Id: I1bdeaa0c31413d701c64acd748a1b196177b3fcc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1857047Reviewed-by: default avatarJohn Abd-El-Malek <jam@chromium.org>
Reviewed-by: default avatarTommy Li <tommycli@chromium.org>
Commit-Queue: Livvie Lin <livvielin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705670}
parent a9286397
...@@ -28,6 +28,7 @@ include_rules = [ ...@@ -28,6 +28,7 @@ include_rules = [
"+components/variations", "+components/variations",
"+components/vector_icons", "+components/vector_icons",
"+content/public/browser", "+content/public/browser",
"+content/public/common",
"+extensions/common/constants.h", "+extensions/common/constants.h",
"+net", "+net",
"+services/network/public/cpp", "+services/network/public/cpp",
......
...@@ -18,8 +18,10 @@ ...@@ -18,8 +18,10 @@
#include "components/omnibox/common/omnibox_features.h" #include "components/omnibox/common/omnibox_features.h"
#include "components/prefs/pref_service.h" #include "components/prefs/pref_service.h"
#include "components/search_engines/template_url_service.h" #include "components/search_engines/template_url_service.h"
#include "components/security_state/core/features.h"
#include "components/security_state/core/security_state.h" #include "components/security_state/core/security_state.h"
#include "components/strings/grit/components_strings.h" #include "components/strings/grit/components_strings.h"
#include "content/public/common/origin_util.h"
#include "net/cert/cert_status_flags.h" #include "net/cert/cert_status_flags.h"
#include "net/cert/x509_certificate.h" #include "net/cert/x509_certificate.h"
#include "net/ssl/ssl_connection_status_flags.h" #include "net/ssl/ssl_connection_status_flags.h"
...@@ -179,6 +181,18 @@ LocationBarModelImpl::GetPageClassification(OmniboxFocusSource focus_source) { ...@@ -179,6 +181,18 @@ LocationBarModelImpl::GetPageClassification(OmniboxFocusSource focus_source) {
const gfx::VectorIcon& LocationBarModelImpl::GetVectorIcon() const { const gfx::VectorIcon& LocationBarModelImpl::GetVectorIcon() const {
#if (!defined(OS_ANDROID) || BUILDFLAG(ENABLE_VR)) && !defined(OS_IOS) #if (!defined(OS_ANDROID) || BUILDFLAG(ENABLE_VR)) && !defined(OS_IOS)
auto* const icon_override = delegate_->GetVectorIconOverride(); auto* const icon_override = delegate_->GetVectorIconOverride();
GURL url = GetURL();
bool http_danger_warning_enabled = false;
if (base::FeatureList::IsEnabled(
security_state::features::kMarkHttpAsFeature)) {
std::string parameter = base::GetFieldTrialParamValueByFeature(
security_state::features::kMarkHttpAsFeature,
security_state::features::kMarkHttpAsFeatureParameterName);
if (parameter ==
security_state::features::kMarkHttpAsParameterDangerWarning) {
http_danger_warning_enabled = true;
}
}
if (icon_override) if (icon_override)
return *icon_override; return *icon_override;
...@@ -187,7 +201,18 @@ const gfx::VectorIcon& LocationBarModelImpl::GetVectorIcon() const { ...@@ -187,7 +201,18 @@ const gfx::VectorIcon& LocationBarModelImpl::GetVectorIcon() const {
switch (GetSecurityLevel()) { switch (GetSecurityLevel()) {
case security_state::NONE: case security_state::NONE:
// Show a danger triangle icon on HTTPS pages with passive mixed content
// when kMarkHttpAsParameterDangerWarning is enabled.
if (http_danger_warning_enabled && url.SchemeIsCryptographic()) {
return omnibox::kNotSecureWarningIcon;
}
return omnibox::kHttpIcon;
case security_state::WARNING: case security_state::WARNING:
// When kMarkHttpAsParameterDangerWarning is enabled, show a danger
// triangle icon unless the page has a non-HTTPS secure origin.
if (http_danger_warning_enabled && !content::IsOriginSecure(url)) {
return omnibox::kNotSecureWarningIcon;
}
return omnibox::kHttpIcon; return omnibox::kHttpIcon;
case security_state::EV_SECURE: case security_state::EV_SECURE:
case security_state::SECURE: case security_state::SECURE:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment