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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ssl/chrome_security_state_model_client.cc

Issue 2224193003: Rename SecurityStateModel::MIXED_CONTENT_STATUS enum values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc » ('j') | components/security_state/security_state_model.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ssl/chrome_security_state_model_client.cc
diff --git a/chrome/browser/ssl/chrome_security_state_model_client.cc b/chrome/browser/ssl/chrome_security_state_model_client.cc
index 3e1834b210eaa2ecdf6587c9452db0ccdf779ce1..69cc22783d3dcef8515d5d4730b8b9752c071d86 100644
--- a/chrome/browser/ssl/chrome_security_state_model_client.cc
+++ b/chrome/browser/ssl/chrome_security_state_model_client.cc
@@ -133,14 +133,14 @@ content::SecurityStyle ChromeSecurityStateModelClient::GetSecurityStyle(
security_style_explanations->ran_insecure_content =
security_info.mixed_content_status ==
- SecurityStateModel::RAN_MIXED_CONTENT ||
+ SecurityStateModel::CONTENT_STATUS_RAN ||
security_info.mixed_content_status ==
- SecurityStateModel::RAN_AND_DISPLAYED_MIXED_CONTENT;
+ SecurityStateModel::CONTENT_STATUS_DISPLAYED_AND_RAN;
security_style_explanations->displayed_insecure_content =
security_info.mixed_content_status ==
- SecurityStateModel::DISPLAYED_MIXED_CONTENT ||
+ SecurityStateModel::CONTENT_STATUS_DISPLAYED ||
security_info.mixed_content_status ==
- SecurityStateModel::RAN_AND_DISPLAYED_MIXED_CONTENT;
+ SecurityStateModel::CONTENT_STATUS_DISPLAYED_AND_RAN;
if (net::IsCertStatusError(security_info.cert_status)) {
base::string16 error_string = base::UTF8ToUTF16(net::ErrorToString(
« no previous file with comments | « no previous file | chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc » ('j') | components/security_state/security_state_model.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698