Chromium Code Reviews| Index: components/security_state/security_state_model.h |
| diff --git a/chrome/browser/ssl/security_state_model.h b/components/security_state/security_state_model.h |
| similarity index 92% |
| rename from chrome/browser/ssl/security_state_model.h |
| rename to components/security_state/security_state_model.h |
| index 9d21b2d24347dbbe85d29e69f5476e3a78fe9a46..b85a41326d9c6de2ca560ca4eeba1f17c5f0cc35 100644 |
| --- a/chrome/browser/ssl/security_state_model.h |
| +++ b/components/security_state/security_state_model.h |
| @@ -2,8 +2,8 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef CHROME_BROWSER_SSL_SECURITY_STATE_MODEL_H_ |
| -#define CHROME_BROWSER_SSL_SECURITY_STATE_MODEL_H_ |
| +#ifndef COMPONENTS_SECURITY_STATE_SECURITY_STATE_MODEL_H_ |
| +#define COMPONENTS_SECURITY_STATE_SECURITY_STATE_MODEL_H_ |
| #include "base/macros.h" |
| #include "net/cert/cert_status_flags.h" |
| @@ -11,7 +11,8 @@ |
| #include "net/cert/x509_certificate.h" |
| #include "url/gurl.h" |
| -class Profile; |
| +namespace security_state { |
| + |
| class SecurityStateModelClient; |
| // SecurityStateModel provides high-level security information about a |
| @@ -22,6 +23,10 @@ class SecurityStateModelClient; |
| // is a single value describing the overall security state) along with |
| // information that a consumer might want to display in UI to explain or |
| // elaborate on the SecurityLevel. |
| +// |
| +// A Java counterpart will be generated for this enum. |
|
blundell
2016/01/07 08:39:30
nit: the comments added at lines 26-29 seem unnece
estark
2016/01/07 19:18:25
Oops, just a copy/paste error. Removed.
|
| +// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.components.security_state |
| +// GENERATED_JAVA_CLASS_NAME_OVERRIDE: ConnectionSecurityLevel |
| class SecurityStateModel { |
| public: |
| // Describes the overall security state of the page. |
| @@ -30,7 +35,7 @@ class SecurityStateModel { |
| // update the UI icons in ToolbarModelImpl::GetIconForSecurityLevel. |
| // |
| // A Java counterpart will be generated for this enum. |
| - // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.ssl |
| + // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.components.security_state |
| // GENERATED_JAVA_CLASS_NAME_OVERRIDE: ConnectionSecurityLevel |
| enum SecurityLevel { |
| // HTTP/no URL/HTTPS but with insecure passive content on the page |
| @@ -163,4 +168,6 @@ class SecurityStateModel { |
| DISALLOW_COPY_AND_ASSIGN(SecurityStateModel); |
| }; |
| -#endif // CHROME_BROWSER_SSL_SECURITY_STATE_MODEL_H_ |
| +} // namespace security_state |
| + |
| +#endif // COMPONENTS_SECURITY_STATE_SECURITY_STATE_MODEL_H_ |