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

Side by Side Diff: components/security_state/security_state_model.cc

Issue 2337103002: Add a new flag for HTTP-bad Phase 1 development work (Closed)
Patch Set: Format Created 4 years, 3 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
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 "components/security_state/security_state_model.h" 5 #include "components/security_state/security_state_model.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 19 matching lines...) Expand all
30 30
31 SecurityStateModel::SecurityLevel level = SecurityStateModel::NONE; 31 SecurityStateModel::SecurityLevel level = SecurityStateModel::NONE;
32 MarkNonSecureStatus status; 32 MarkNonSecureStatus status;
33 33
34 if (choice == switches::kMarkNonSecureAsNeutral) { 34 if (choice == switches::kMarkNonSecureAsNeutral) {
35 status = NEUTRAL; 35 status = NEUTRAL;
36 level = SecurityStateModel::NONE; 36 level = SecurityStateModel::NONE;
37 } else if (choice == switches::kMarkNonSecureAsNonSecure) { 37 } else if (choice == switches::kMarkNonSecureAsNonSecure) {
38 status = NON_SECURE; 38 status = NON_SECURE;
39 level = SecurityStateModel::SECURITY_ERROR; 39 level = SecurityStateModel::SECURITY_ERROR;
40 } else if (group == switches::kMarkNonSecureAsNeutral) { 40 } else if (group == switches::kMarkNonSecureAsNeutral ||
41 group == switches::kMarkNonSecureWithPasswordsAsNonSecure) {
41 status = NEUTRAL; 42 status = NEUTRAL;
42 level = SecurityStateModel::NONE; 43 level = SecurityStateModel::NONE;
43 } else if (group == switches::kMarkNonSecureAsNonSecure) { 44 } else if (group == switches::kMarkNonSecureAsNonSecure) {
44 status = NON_SECURE; 45 status = NON_SECURE;
45 level = SecurityStateModel::SECURITY_ERROR; 46 level = SecurityStateModel::SECURITY_ERROR;
46 } else { 47 } else {
47 status = NEUTRAL; 48 status = NEUTRAL;
48 level = SecurityStateModel::NONE; 49 level = SecurityStateModel::NONE;
49 } 50 }
50 51
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 sct_verify_statuses == other.sct_verify_statuses && 315 sct_verify_statuses == other.sct_verify_statuses &&
315 displayed_mixed_content == other.displayed_mixed_content && 316 displayed_mixed_content == other.displayed_mixed_content &&
316 ran_mixed_content == other.ran_mixed_content && 317 ran_mixed_content == other.ran_mixed_content &&
317 displayed_content_with_cert_errors == 318 displayed_content_with_cert_errors ==
318 other.displayed_content_with_cert_errors && 319 other.displayed_content_with_cert_errors &&
319 ran_content_with_cert_errors == other.ran_content_with_cert_errors && 320 ran_content_with_cert_errors == other.ran_content_with_cert_errors &&
320 pkp_bypassed == other.pkp_bypassed); 321 pkp_bypassed == other.pkp_bypassed);
321 } 322 }
322 323
323 } // namespace security_state 324 } // namespace security_state
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698