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

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

Issue 2690333006: Captive portal certificate list should be checked when name mismatch is the only error (Closed)
Patch Set: Created 3 years, 10 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_ERROR_HANDLER_H_ 5 #ifndef CHROME_BROWSER_SSL_SSL_ERROR_HANDLER_H_
6 #define CHROME_BROWSER_SSL_SSL_ERROR_HANDLER_H_ 6 #define CHROME_BROWSER_SSL_SSL_ERROR_HANDLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback_forward.h" 10 #include "base/callback_forward.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 static void SetInterstitialTimerStartedCallbackForTesting( 123 static void SetInterstitialTimerStartedCallbackForTesting(
124 TimerStartedCallback* callback); 124 TimerStartedCallback* callback);
125 static void SetClockForTesting(base::Clock* testing_clock); 125 static void SetClockForTesting(base::Clock* testing_clock);
126 static void SetNetworkTimeTrackerForTesting( 126 static void SetNetworkTimeTrackerForTesting(
127 network_time::NetworkTimeTracker* tracker); 127 network_time::NetworkTimeTracker* tracker);
128 static std::string GetHistogramNameForTesting(); 128 static std::string GetHistogramNameForTesting();
129 static void SetErrorAssistantConfig( 129 static void SetErrorAssistantConfig(
130 std::unique_ptr<chrome_browser_ssl::SSLErrorAssistantConfig> 130 std::unique_ptr<chrome_browser_ssl::SSLErrorAssistantConfig>
131 config_proto); 131 config_proto);
132 bool IsTimerRunningForTesting() const; 132 bool IsTimerRunningForTesting() const;
133 int cert_error_for_testing() const;
133 134
134 protected: 135 protected:
135 SSLErrorHandler( 136 SSLErrorHandler(
136 std::unique_ptr<Delegate> delegate, 137 std::unique_ptr<Delegate> delegate,
137 content::WebContents* web_contents, 138 content::WebContents* web_contents,
138 Profile* profile, 139 Profile* profile,
139 int cert_error, 140 int cert_error,
140 const net::SSLInfo& ssl_info, 141 const net::SSLInfo& ssl_info,
141 const GURL& request_url, 142 const GURL& request_url,
142 const base::Callback<void(content::CertificateRequestResultType)>& 143 const base::Callback<void(content::CertificateRequestResultType)>&
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 base::OneShotTimer timer_; 194 base::OneShotTimer timer_;
194 195
195 std::unique_ptr<CommonNameMismatchHandler> common_name_mismatch_handler_; 196 std::unique_ptr<CommonNameMismatchHandler> common_name_mismatch_handler_;
196 197
197 base::WeakPtrFactory<SSLErrorHandler> weak_ptr_factory_; 198 base::WeakPtrFactory<SSLErrorHandler> weak_ptr_factory_;
198 199
199 DISALLOW_COPY_AND_ASSIGN(SSLErrorHandler); 200 DISALLOW_COPY_AND_ASSIGN(SSLErrorHandler);
200 }; 201 };
201 202
202 #endif // CHROME_BROWSER_SSL_SSL_ERROR_HANDLER_H_ 203 #endif // CHROME_BROWSER_SSL_SSL_ERROR_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698