Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(165)

Side by Side Diff: chrome/browser/ssl/chrome_security_state_model_client.cc

Issue 2224023003: Teach SecurityStateModel about subresources with cert errors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase fixup 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 unified diff | Download patch
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 state->cert_id = ssl.cert_id; 239 state->cert_id = ssl.cert_id;
240 state->cert_status = ssl.cert_status; 240 state->cert_status = ssl.cert_status;
241 state->connection_status = ssl.connection_status; 241 state->connection_status = ssl.connection_status;
242 state->security_bits = ssl.security_bits; 242 state->security_bits = ssl.security_bits;
243 state->pkp_bypassed = ssl.pkp_bypassed; 243 state->pkp_bypassed = ssl.pkp_bypassed;
244 state->sct_verify_statuses.clear(); 244 state->sct_verify_statuses.clear();
245 state->sct_verify_statuses.insert(state->sct_verify_statuses.begin(), 245 state->sct_verify_statuses.insert(state->sct_verify_statuses.begin(),
246 ssl.sct_statuses.begin(), 246 ssl.sct_statuses.begin(),
247 ssl.sct_statuses.end()); 247 ssl.sct_statuses.end());
248 state->displayed_mixed_content = 248 state->displayed_mixed_content =
249 (ssl.content_status & content::SSLStatus::DISPLAYED_INSECURE_CONTENT) 249 !!(ssl.content_status & content::SSLStatus::DISPLAYED_INSECURE_CONTENT);
250 ? true
251 : false;
252 state->ran_mixed_content = 250 state->ran_mixed_content =
253 (ssl.content_status & content::SSLStatus::RAN_INSECURE_CONTENT) ? true 251 !!(ssl.content_status & content::SSLStatus::RAN_INSECURE_CONTENT);
254 : false; 252 state->displayed_content_with_cert_errors =
253 !!(ssl.content_status &
254 content::SSLStatus::DISPLAYED_CONTENT_WITH_CERT_ERRORS);
255 state->ran_content_with_cert_errors =
256 !!(ssl.content_status & content::SSLStatus::RAN_CONTENT_WITH_CERT_ERRORS);
255 } 257 }
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698