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

Side by Side Diff: chrome/browser/ssl/ssl_blocking_page.h

Issue 1317593002: Have SSLErrorHandler decide which type of interstitial to display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: typo Created 5 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
« no previous file with comments | « chrome/browser/ssl/bad_clock_blocking_page.cc ('k') | chrome/browser/ssl/ssl_blocking_page.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_ 5 #ifndef CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
6 #define CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_ 6 #define CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 void OnDontProceed() override; 92 void OnDontProceed() override;
93 93
94 // SecurityInterstitialPage implementation: 94 // SecurityInterstitialPage implementation:
95 bool ShouldCreateNewNavigation() const override; 95 bool ShouldCreateNewNavigation() const override;
96 void PopulateInterstitialStrings( 96 void PopulateInterstitialStrings(
97 base::DictionaryValue* load_time_data) override; 97 base::DictionaryValue* load_time_data) override;
98 98
99 private: 99 private:
100 void NotifyDenyCertificate(); 100 void NotifyDenyCertificate();
101 void NotifyAllowCertificate(); 101 void NotifyAllowCertificate();
102 CertificateErrorReport::InterstitialReason GetCertReportInterstitialReason();
103 102
104 std::string GetUmaHistogramPrefix() const; 103 std::string GetUmaHistogramPrefix() const;
105 std::string GetSamplingEventName() const; 104 std::string GetSamplingEventName() const;
106 105
107 base::Callback<void(bool)> callback_; 106 base::Callback<void(bool)> callback_;
108 107
109 const int cert_error_; 108 const int cert_error_;
110 const net::SSLInfo ssl_info_; 109 const net::SSLInfo ssl_info_;
111 // There are two ways for the user to override an interstitial: 110 // There are two ways for the user to override an interstitial:
112 // 111 //
(...skipping 10 matching lines...) Expand all
123 // expired? 122 // expired?
124 const bool expired_but_previously_allowed_; 123 const bool expired_but_previously_allowed_;
125 scoped_ptr<SSLErrorClassification> ssl_error_classification_; 124 scoped_ptr<SSLErrorClassification> ssl_error_classification_;
126 125
127 // The time at which the interstitial was triggered. The interstitial 126 // The time at which the interstitial was triggered. The interstitial
128 // calculates all times relative to this. 127 // calculates all times relative to this.
129 const base::Time time_triggered_; 128 const base::Time time_triggered_;
130 129
131 scoped_ptr<CertReportHelper> cert_report_helper_; 130 scoped_ptr<CertReportHelper> cert_report_helper_;
132 131
133 // Which type of interstitial this is.
134 enum SSLInterstitialReason {
135 SSL_REASON_SSL,
136 SSL_REASON_BAD_CLOCK
137 } interstitial_reason_;
138
139 DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage); 132 DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage);
140 }; 133 };
141 134
142 #endif // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_ 135 #endif // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
OLDNEW
« no previous file with comments | « chrome/browser/ssl/bad_clock_blocking_page.cc ('k') | chrome/browser/ssl/ssl_blocking_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698