chrome/browser/ssl/chrome_security_state_model_client.cc - Issue 2224193003: Rename SecurityStateModel::MIXED_CONTENT_STATUS enum values

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

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 0988c8ac76186c1d085ff636dec001dd67a0c88e..74bf839a1a8cfcc98bdd88e1c3534bf12ecffdc0 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') | no next file with comments »