OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "chrome/browser/ssl/chrome_security_state_model_client.h" | 5 #include "chrome/browser/ssl/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 "build/build_config.h" | 10 #include "build/build_config.h" |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
103 state->initialized = true; | 103 state->initialized = true; |
104 state->url = entry->GetURL(); | 104 state->url = entry->GetURL(); |
105 const content::SSLStatus& ssl = entry->GetSSL(); | 105 const content::SSLStatus& ssl = entry->GetSSL(); |
106 state->initial_security_level = | 106 state->initial_security_level = |
107 GetSecurityLevelForSecurityStyle(ssl.security_style); | 107 GetSecurityLevelForSecurityStyle(ssl.security_style); |
108 state->cert_id = ssl.cert_id; | 108 state->cert_id = ssl.cert_id; |
109 state->cert_status = ssl.cert_status; | 109 state->cert_status = ssl.cert_status; |
110 state->connection_status = ssl.connection_status; | 110 state->connection_status = ssl.connection_status; |
111 state->security_bits = ssl.security_bits; | 111 state->security_bits = ssl.security_bits; |
112 state->sct_verify_statuses.clear(); | 112 state->sct_verify_statuses.clear(); |
113 for (const auto& sct : ssl.signed_certificate_timestamp_ids) | 113 int i; |
Eran Messeri
2016/04/26 09:29:51
nit: Inline definition of i in the for loop(s).
Ev
dwaxweiler
2016/04/28 07:46:19
Acknowledged.
| |
114 state->sct_verify_statuses.push_back(sct.status); | 114 for (i = 0; i < ssl.num_unknown_scts; i++) |
115 state->sct_verify_statuses.push_back(net::ct::SCT_STATUS_LOG_UNKNOWN); | |
116 for (i = 0; i < ssl.num_invalid_scts; i++) | |
117 state->sct_verify_statuses.push_back(net::ct::SCT_STATUS_INVALID); | |
118 for (i = 0; i < ssl.num_valid_scts; i++) | |
119 state->sct_verify_statuses.push_back(net::ct::SCT_STATUS_OK); | |
115 state->displayed_mixed_content = | 120 state->displayed_mixed_content = |
116 (ssl.content_status & content::SSLStatus::DISPLAYED_INSECURE_CONTENT) | 121 (ssl.content_status & content::SSLStatus::DISPLAYED_INSECURE_CONTENT) |
117 ? true | 122 ? true |
118 : false; | 123 : false; |
119 state->ran_mixed_content = | 124 state->ran_mixed_content = |
120 (ssl.content_status & content::SSLStatus::RAN_INSECURE_CONTENT) ? true | 125 (ssl.content_status & content::SSLStatus::RAN_INSECURE_CONTENT) ? true |
121 : false; | 126 : false; |
122 } | 127 } |
OLD | NEW |