Chromium Code Reviews| 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 #ifndef COMPONENTS_SECURITY_STATE_SECURITY_STATE_MODEL_H_ | 5 #ifndef COMPONENTS_SECURITY_STATE_SECURITY_STATE_MODEL_H_ |
| 6 #define COMPONENTS_SECURITY_STATE_SECURITY_STATE_MODEL_H_ | 6 #define COMPONENTS_SECURITY_STATE_SECURITY_STATE_MODEL_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 32 // If you reorder, add, or delete values from this enum, you must also | 32 // If you reorder, add, or delete values from this enum, you must also |
| 33 // update the UI icons in ToolbarModelImpl::GetIconForSecurityLevel. | 33 // update the UI icons in ToolbarModelImpl::GetIconForSecurityLevel. |
| 34 // | 34 // |
| 35 // A Java counterpart will be generated for this enum. | 35 // A Java counterpart will be generated for this enum. |
| 36 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.components.security_state | 36 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.components.security_state |
| 37 // GENERATED_JAVA_CLASS_NAME_OVERRIDE: ConnectionSecurityLevel | 37 // GENERATED_JAVA_CLASS_NAME_OVERRIDE: ConnectionSecurityLevel |
| 38 enum SecurityLevel { | 38 enum SecurityLevel { |
| 39 // HTTP/no URL/HTTPS but with insecure passive content on the page. | 39 // HTTP/no URL/HTTPS but with insecure passive content on the page. |
| 40 NONE, | 40 NONE, |
| 41 | 41 |
| 42 // CAUTION: Do ***not*** use this SecurityLevel state, except behind a | |
| 43 // switches::kMarkHttpAs flag! (https://crbug.com/647754) | |
|
Peter Kasting
2016/09/19 18:38:21
Nit: Does this caution really belong here? I'm wo
felt
2016/09/19 18:54:09
I'm afraid of someone randomly seeing it and tryin
Peter Kasting
2016/09/19 18:58:30
Why would someone randomly see it? In what sort o
felt
2016/09/20 00:20:09
Reworded, PTAL.
| |
| 44 // HTTP, but something about the page (e.g., inclusion of private info) | |
| 45 // suggests we should show a warning for it. | |
| 46 HTTP_WARNING, | |
|
Peter Kasting
2016/09/19 18:38:21
Hmm. These names seem worrisome, especially since
felt
2016/09/19 18:54:09
SECURITY_WARNING is being deprecated in another CL
Peter Kasting
2016/09/19 18:58:30
If that were gone (does deprecated mean "removed"?
felt
2016/09/20 00:20:09
Lucas is removing SECURITY_WARNING completely, see
Peter Kasting
2016/09/20 00:50:05
Yay.
felt
2016/09/20 01:09:56
Sold on HTTP_SHOW_WARNING.
| |
| 47 | |
| 42 // HTTPS with valid EV cert. | 48 // HTTPS with valid EV cert. |
| 43 EV_SECURE, | 49 EV_SECURE, |
| 44 | 50 |
| 45 // HTTPS (non-EV) with valid cert. | 51 // HTTPS (non-EV) with valid cert. |
| 46 SECURE, | 52 SECURE, |
| 47 | 53 |
| 48 // HTTPS, but with an outdated protocol version. | 54 // HTTPS, but with an outdated protocol version. |
| 49 SECURITY_WARNING, | 55 SECURITY_WARNING, |
| 50 | 56 |
| 51 // HTTPS, but the certificate verification chain is anchored on a | 57 // HTTPS, but the certificate verification chain is anchored on a |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 195 mutable VisibleSecurityState visible_security_state_; | 201 mutable VisibleSecurityState visible_security_state_; |
| 196 | 202 |
| 197 SecurityStateModelClient* client_; | 203 SecurityStateModelClient* client_; |
| 198 | 204 |
| 199 DISALLOW_COPY_AND_ASSIGN(SecurityStateModel); | 205 DISALLOW_COPY_AND_ASSIGN(SecurityStateModel); |
| 200 }; | 206 }; |
| 201 | 207 |
| 202 } // namespace security_state | 208 } // namespace security_state |
| 203 | 209 |
| 204 #endif // COMPONENTS_SECURITY_STATE_SECURITY_STATE_MODEL_H_ | 210 #endif // COMPONENTS_SECURITY_STATE_SECURITY_STATE_MODEL_H_ |
| OLD | NEW |