chrome/browser/ui/website_settings/website_settings.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/ui/website_settings/website_settings.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 | « chrome/browser/ssl/security_state_model_android.cc ('k') | chrome/browser/ui/website_settings/website_settings_unittest.cc » ('j') | components/security_state/security_state_model.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/website_settings/website_settings.cc

diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc

index 21a35e9114ae86eb4e781332cb575ec35242c17d..5b0fc08b430c8f786353623bdd485106b63e145a 100644

--- a/chrome/browser/ui/website_settings/website_settings.cc

+++ b/chrome/browser/ui/website_settings/website_settings.cc

@@ -555,12 +555,12 @@ void WebsiteSettings::Init(

}

if (security_info.mixed_content_status !=

- SecurityStateModel::NO_MIXED_CONTENT) {

+ SecurityStateModel::CONTENT_STATUS_NONE) {

bool 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);

site_connection_status_ = ran_insecure_content

? SITE_CONNECTION_STATUS_MIXED_SCRIPT

: SITE_CONNECTION_STATUS_MIXED_CONTENT;