chrome/browser/ssl/security_state_model_android.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/security_state_model_android.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/chrome_security_state_model_client_browser_tests.cc ('k') | chrome/browser/ui/website_settings/website_settings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ssl/security_state_model_android.cc

diff --git a/chrome/browser/ssl/security_state_model_android.cc b/chrome/browser/ssl/security_state_model_android.cc

index b861e67cc5d110c87622ee8137ae2a499e3d905b..ad24fa05388fc01e883912275d03a90023f3e960 100644

--- a/chrome/browser/ssl/security_state_model_android.cc

+++ b/chrome/browser/ssl/security_state_model_android.cc

@@ -59,8 +59,8 @@ jboolean IsPassiveMixedContentPresent(

ChromeSecurityStateModelClient::FromWebContents(web_contents);

DCHECK(model_client);

return model_client->GetSecurityInfo().mixed_content_status ==

- security_state::SecurityStateModel::DISPLAYED_MIXED_CONTENT ||

+ security_state::SecurityStateModel::CONTENT_STATUS_DISPLAYED ||

model_client->GetSecurityInfo().mixed_content_status ==

security_state::SecurityStateModel::

- RAN_AND_DISPLAYED_MIXED_CONTENT;

+ CONTENT_STATUS_DISPLAYED_AND_RAN;

}