From 41a8669d04f762fe62a68b74425133b3c91f9ff6 Mon Sep 17 00:00:00 2001 From: "agl@chromium.org" Date: Tue, 27 Sep 2011 16:39:00 +0000 Subject: net: make HSTS hosts use the normal SSL interstitials SSL interstitials have better translations for the error messages and this returns us to the point where we have only a single UI for SSL errors, which will make some future changes easier. First, this change changes the SSL error callbacks to take an SSLInfo& rather than a X509Certificate* (which was already a TODO(wtc) in the code). Most of this change is the resulting plumbing. It also adds a |is_hsts_host| flag to the callbacks to denote an HSTS host. Finally, in ssl_policy.cc the |is_hsts_host| flag causes any error to be fatal. BUG=93527 http://codereview.chromium.org/7976036/ git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102947 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/fileapi/file_writer_delegate.h | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'webkit/fileapi/file_writer_delegate.h') diff --git a/webkit/fileapi/file_writer_delegate.h b/webkit/fileapi/file_writer_delegate.h index 6d94e6e..7f25212 100644 --- a/webkit/fileapi/file_writer_delegate.h +++ b/webkit/fileapi/file_writer_delegate.h @@ -38,16 +38,20 @@ class FileWriterDelegate : public net::URLRequest::Delegate { return file_; } - virtual void OnReceivedRedirect( - net::URLRequest* request, const GURL& new_url, bool* defer_redirect); - virtual void OnAuthRequired( - net::URLRequest* request, net::AuthChallengeInfo* auth_info); + virtual void OnReceivedRedirect(net::URLRequest* request, + const GURL& new_url, + bool* defer_redirect) OVERRIDE; + virtual void OnAuthRequired(net::URLRequest* request, + net::AuthChallengeInfo* auth_info) OVERRIDE; virtual void OnCertificateRequested( - net::URLRequest* request, net::SSLCertRequestInfo* cert_request_info); - virtual void OnSSLCertificateError( - net::URLRequest* request, int cert_error, net::X509Certificate* cert); - virtual void OnResponseStarted(net::URLRequest* request); - virtual void OnReadCompleted(net::URLRequest* request, int bytes_read); + net::URLRequest* request, + net::SSLCertRequestInfo* cert_request_info) OVERRIDE; + virtual void OnSSLCertificateError(net::URLRequest* request, + const net::SSLInfo& ssl_info, + bool is_hsts_host) OVERRIDE; + virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE; + virtual void OnReadCompleted(net::URLRequest* request, + int bytes_read) OVERRIDE; private: void OnGetFileInfoAndCallStartUpdate( -- cgit v1.1