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

Unified Diff: content/browser/ssl/ssl_policy.h

Issue 578373002: Interstitial options are not OR'd properly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Changed API to pass options_mask through Created 6 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 side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698