| Index: chrome/browser/ssl/ssl_error_handler.h
|
| diff --git a/chrome/browser/ssl/ssl_error_handler.h b/chrome/browser/ssl/ssl_error_handler.h
|
| index fb6fd7039c2f6212088db5fd6597ceb57e60fcbf..c7d2dcb287e893e1b2ed65d69870236cadeacdbf 100644
|
| --- a/chrome/browser/ssl/ssl_error_handler.h
|
| +++ b/chrome/browser/ssl/ssl_error_handler.h
|
| @@ -9,6 +9,7 @@
|
|
|
| #include "base/callback_forward.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/ref_counted.h"
|
| #include "base/timer/timer.h"
|
| #include "chrome/browser/chrome_notification_types.h"
|
| #include "content/public/browser/notification_observer.h"
|
| @@ -22,6 +23,10 @@ class RenderViewHost;
|
| class WebContents;
|
| }
|
|
|
| +namespace chrome_browser_net {
|
| +class CertificateErrorReporter;
|
| +}
|
| +
|
| // This class is responsible for deciding whether to show an SSL warning or a
|
| // captive portal error page. It makes this decision by delaying the display of
|
| // SSL interstitial for a few seconds (2 by default), and waiting for a captive
|
| @@ -44,12 +49,15 @@ class SSLErrorHandler : public content::WebContentsUserData<SSLErrorHandler>,
|
| LONG // Very long interstitial timer delay (ie. an hour), used in tests.
|
| };
|
|
|
| - static void HandleSSLError(content::WebContents* web_contents,
|
| - int cert_error,
|
| - const net::SSLInfo& ssl_info,
|
| - const GURL& request_url,
|
| - int options_mask,
|
| - const base::Callback<void(bool)>& callback);
|
| + static void HandleSSLError(
|
| + content::WebContents* web_contents,
|
| + int cert_error,
|
| + const net::SSLInfo& ssl_info,
|
| + const GURL& request_url,
|
| + int options_mask,
|
| + const scoped_refptr<chrome_browser_net::CertificateErrorReporter>&
|
| + certificate_error_reporter,
|
| + const base::Callback<void(bool)>& callback);
|
|
|
| static void SetInterstitialDelayTypeForTest(InterstitialDelayType delay);
|
|
|
| @@ -63,6 +71,8 @@ class SSLErrorHandler : public content::WebContentsUserData<SSLErrorHandler>,
|
| const net::SSLInfo& ssl_info,
|
| const GURL& request_url,
|
| int options_mask,
|
| + scoped_refptr<chrome_browser_net::CertificateErrorReporter>
|
| + certificate_error_reporter,
|
| const base::Callback<void(bool)>& callback);
|
|
|
| ~SSLErrorHandler() override;
|
| @@ -96,6 +106,8 @@ class SSLErrorHandler : public content::WebContentsUserData<SSLErrorHandler>,
|
| const net::SSLInfo ssl_info_;
|
| const GURL request_url_;
|
| const int options_mask_;
|
| + scoped_refptr<chrome_browser_net::CertificateErrorReporter>
|
| + certificate_error_reporter_;
|
| const base::Callback<void(bool)> callback_;
|
|
|
| content::NotificationRegistrar registrar_;
|
|
|