| Index: content/browser/ssl/ssl_policy.h
|
| diff --git a/content/browser/ssl/ssl_policy.h b/content/browser/ssl/ssl_policy.h
|
| index 78dbb6d8960f59237658d3d5c032374d851b6342..9c99c804cba1fdcd70b692d06059c6dc115dfccf 100644
|
| --- a/content/browser/ssl/ssl_policy.h
|
| +++ b/content/browser/ssl/ssl_policy.h
|
| @@ -44,26 +44,21 @@ class SSLPolicy {
|
| SSLPolicyBackend* backend() const { return backend_; }
|
|
|
| private:
|
| - enum OnCertErrorInternalOptionsMask {
|
| - OVERRIDABLE = 1 << 0,
|
| - STRICT_ENFORCEMENT = 1 << 1,
|
| - EXPIRED_PREVIOUS_DECISION = 1 << 2
|
| - };
|
| -
|
| // Callback that the user chose to accept or deny the certificate.
|
| void OnAllowCertificate(scoped_refptr<SSLCertErrorHandler> handler,
|
| bool allow);
|
|
|
| // Helper method for derived classes handling certificate errors.
|
| //
|
| - // Options should be a bitmask combination of OnCertErrorInternalOptionsMask.
|
| - // OVERRIDABLE indicates whether or not the user could (assuming perfect
|
| - // knowledge) successfully override the error and still get the security
|
| - // guarantees of TLS. STRICT_ENFORCEMENT indicates whether or not the site the
|
| - // user is trying to connect to has requested strict enforcement of
|
| - // certificate validation (e.g. with HTTP Strict-Transport-Security).
|
| - // EXPIRED_PREVIOUS_DECISION indicates whether a user decision had been
|
| - // previously made but the decision has expired.
|
| + // |options_mask| should be a bitmask combination of
|
| + // ContentBrowserClient::AllowCertErrorOptionsMask. OVERRIDABLE indicates
|
| + // whether or not the user could (assuming perfect knowledge) successfully
|
| + // override the error and still get the security guarantees of TLS.
|
| + // STRICT_ENFORCEMENT indicates whether or not the site the user is trying to
|
| + // connect to has requested strict enforcement of certificate validation (e.g.
|
| + // with HTTP Strict-Transport-Security). EXPIRED_PREVIOUS_DECISION indicates
|
| + // whether a user decision had been previously made but the decision has
|
| + // expired.
|
| void OnCertErrorInternal(SSLCertErrorHandler* handler, int options_mask);
|
|
|
| // If the security style of |entry| has not been initialized, then initialize
|
|
|