| Index: content/browser/ssl/ssl_client_auth_handler.h
|
| ===================================================================
|
| --- content/browser/ssl/ssl_client_auth_handler.h (revision 121706)
|
| +++ content/browser/ssl/ssl_client_auth_handler.h (working copy)
|
| @@ -11,8 +11,6 @@
|
| #include "base/message_loop_helpers.h"
|
| #include "content/common/content_export.h"
|
| #include "content/public/browser/browser_thread.h"
|
| -#include "content/public/browser/notification_observer.h"
|
| -#include "content/public/browser/notification_registrar.h"
|
| #include "net/base/ssl_cert_request_info.h"
|
|
|
| namespace net {
|
| @@ -45,19 +43,6 @@
|
| // be long after DoSelectCertificate returns, if the UI is modeless/async.)
|
| void CertificateSelected(net::X509Certificate* cert);
|
|
|
| - // Like CertificateSelected, but does not send SSL_CLIENT_AUTH_CERT_SELECTED
|
| - // notification. Used to avoid notification re-spamming when other
|
| - // certificate selectors act on a notification matching the same host.
|
| - virtual void CertificateSelectedNoNotify(net::X509Certificate* cert);
|
| -
|
| - // Returns the SSLCertRequestInfo for this handler.
|
| - net::SSLCertRequestInfo* cert_request_info() { return cert_request_info_; }
|
| -
|
| - // Returns the session the URL request is associated with.
|
| - const net::HttpNetworkSession* http_network_session() const {
|
| - return http_network_session_;
|
| - }
|
| -
|
| protected:
|
| virtual ~SSLClientAuthHandler();
|
|
|
| @@ -87,39 +72,4 @@
|
| DISALLOW_COPY_AND_ASSIGN(SSLClientAuthHandler);
|
| };
|
|
|
| -class CONTENT_EXPORT SSLClientAuthObserver
|
| - : public content::NotificationObserver {
|
| - public:
|
| - SSLClientAuthObserver(net::SSLCertRequestInfo* cert_request_info,
|
| - SSLClientAuthHandler* handler);
|
| - virtual ~SSLClientAuthObserver();
|
| -
|
| - // UI should implement this to close the dialog.
|
| - virtual void OnCertSelectedByNotification() = 0;
|
| -
|
| - // content::NotificationObserver implementation:
|
| - virtual void Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) OVERRIDE;
|
| -
|
| - // Begins observing notifications from other SSLClientAuthHandler instances.
|
| - // If another instance chooses a cert for a matching SSLCertRequestInfo, we
|
| - // will also use the same cert and OnCertSelectedByNotification will be called
|
| - // so that the cert selection UI can be closed.
|
| - void StartObserving();
|
| -
|
| - // Stops observing notifications. We will no longer act on client auth
|
| - // notifications.
|
| - void StopObserving();
|
| -
|
| - private:
|
| - scoped_refptr<net::SSLCertRequestInfo> cert_request_info_;
|
| -
|
| - scoped_refptr<SSLClientAuthHandler> handler_;
|
| -
|
| - content::NotificationRegistrar notification_registrar_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(SSLClientAuthObserver);
|
| -};
|
| -
|
| #endif // CONTENT_BROWSER_SSL_SSL_CLIENT_AUTH_HANDLER_H_
|
|
|