Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(651)

Unified Diff: components/security_state/core/security_state.cc

Issue 2635423002: Enable HTTP-bad Phase 1 by default except iOS (Closed)
Patch Set: fixes Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/security_state/core/security_state.cc
diff --git a/components/security_state/core/security_state.cc b/components/security_state/core/security_state.cc
index d5e867ed6de8ae7ea425a6ac330887c8a8ac19c3..e1f706562df7e9cd8eb21455e873d78fcee7a0fc 100644
--- a/components/security_state/core/security_state.cc
+++ b/components/security_state/core/security_state.cc
@@ -74,9 +74,17 @@ SecurityLevel GetSecurityLevelForNonSecureFieldTrial(
if (!GetSecurityLevelAndHistogramValueForNonSecureFieldTrial(
group, displayed_sensitive_input_on_http, &level, &status)) {
// If neither the command-line switch nor field trial group is set, then
- // nonsecure defaults to neutral.
+ // nonsecure defaults to neutral for iOS and HTTP_SHOW_WARNING on other
+ // platforms.
+#if defined(OS_IOS)
status = NEUTRAL;
level = NONE;
+#else
+ status = HTTP_SHOW_WARNING;
+ level = displayed_sensitive_input_on_http
+ ? security_state::HTTP_SHOW_WARNING
+ : NONE;
+#endif
}
}

Powered by Google App Engine
This is Rietveld 408576698