ios/chrome/browser/ssl/ios_chrome_security_state_model_client.cc - Issue 1578273002: Populate VisibleSecurityState::displayed_mixed_content on iOS

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: ios/chrome/browser/ssl/ios_chrome_security_state_model_client.cc

Issue 1578273002: Populate VisibleSecurityState::displayed_mixed_content on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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 unified diff | Download patch

« no previous file with comments | « no previous file | no next file » | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ios/chrome/browser/ssl/ios_chrome_security_state_model_client.h"	5 #include "ios/chrome/browser/ssl/ios_chrome_security_state_model_client.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/metrics/field_trial.h"	8 #include "base/metrics/field_trial.h"

9 #include "base/metrics/histogram_macros.h"	9 #include "base/metrics/histogram_macros.h"

10 #include "ios/web/public/cert_store.h"	10 #include "ios/web/public/cert_store.h"

(...skipping 80 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
91	91

92 state->initialized = true;	92 state->initialized = true;

93 state->url = item->GetURL();	93 state->url = item->GetURL();

94 const web::SSLStatus& ssl = item->GetSSL();	94 const web::SSLStatus& ssl = item->GetSSL();

95 state->initial_security_level =	95 state->initial_security_level =

96 GetSecurityLevelForSecurityStyle(ssl.security_style);	96 GetSecurityLevelForSecurityStyle(ssl.security_style);

97 state->cert_id = ssl.cert_id;	97 state->cert_id = ssl.cert_id;

98 state->cert_status = ssl.cert_status;	98 state->cert_status = ssl.cert_status;

99 state->connection_status = ssl.connection_status;	99 state->connection_status = ssl.connection_status;

100 state->security_bits = ssl.security_bits;	100 state->security_bits = ssl.security_bits;

	101 state->displayed_mixed_content =
	Eugene But (OOO till 7-30) 2016/01/12 17:11:30 FWIW the following code seems to be cleaner: stat FWIW the following code seems to be cleaner: state->displayed_mixed_content = ssl.content_status & web::SSLStatus::DISPLAYED_INSECURE_CONTENT; But it's up to you. blundell 2016/01/13 10:40:46 This is copied over from //chrome, going to leave Show quoted text On 2016/01/12 17:11:30, eugenebut wrote: > FWIW the following code seems to be cleaner: > > state->displayed_mixed_content = > ssl.content_status & web::SSLStatus::DISPLAYED_INSECURE_CONTENT; > > But it's up to you. This is copied over from //chrome, going to leave as-is.
	102 (ssl.content_status & web::SSLStatus::DISPLAYED_INSECURE_CONTENT)

	103 ? true

	104 : false;

101 }	105 }

OLD	NEW