summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ssl
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-08 17:50:46 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-08 17:50:46 +0000
commit02d08e07d137b394792d15b712d029455713b195 (patch)
treef1a662492bc8a3aa9b336b459cc6d07531ec0b02 /chrome/browser/ssl
parent2aad74f0f82e51769b6a11516d1136722aead390 (diff)
downloadchromium_src-02d08e07d137b394792d15b712d029455713b195.zip
chromium_src-02d08e07d137b394792d15b712d029455713b195.tar.gz
chromium_src-02d08e07d137b394792d15b712d029455713b195.tar.bz2
FBTF: Small nits; moving virtual methods to implementation.
BUG=none TEST=compiles Review URL: http://codereview.chromium.org/3627002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61976 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
-rw-r--r--chrome/browser/ssl/ssl_add_cert_handler.cc2
-rw-r--r--chrome/browser/ssl/ssl_add_cert_handler.h1
-rw-r--r--chrome/browser/ssl/ssl_cert_error_handler.cc3
-rw-r--r--chrome/browser/ssl/ssl_cert_error_handler.h7
-rw-r--r--chrome/browser/ssl/ssl_client_auth_handler.h2
-rw-r--r--chrome/browser/ssl/ssl_error_handler.cc10
-rw-r--r--chrome/browser/ssl/ssl_error_handler.h6
7 files changed, 25 insertions, 6 deletions
diff --git a/chrome/browser/ssl/ssl_add_cert_handler.cc b/chrome/browser/ssl/ssl_add_cert_handler.cc
index 8cb4a8e..1a78510 100644
--- a/chrome/browser/ssl/ssl_add_cert_handler.cc
+++ b/chrome/browser/ssl/ssl_add_cert_handler.cc
@@ -32,6 +32,8 @@ SSLAddCertHandler::SSLAddCertHandler(URLRequest* request,
NewRunnableMethod(this, &SSLAddCertHandler::Run));
}
+SSLAddCertHandler::~SSLAddCertHandler() {}
+
void SSLAddCertHandler::Run() {
int cert_error;
{
diff --git a/chrome/browser/ssl/ssl_add_cert_handler.h b/chrome/browser/ssl/ssl_add_cert_handler.h
index 0c4ec22..fd73be5 100644
--- a/chrome/browser/ssl/ssl_add_cert_handler.h
+++ b/chrome/browser/ssl/ssl_add_cert_handler.h
@@ -33,6 +33,7 @@ class SSLAddCertHandler : public base::RefCountedThreadSafe<SSLAddCertHandler> {
private:
friend class base::RefCountedThreadSafe<SSLAddCertHandler>;
+ virtual ~SSLAddCertHandler();
// Runs the handler. Called on the IO thread.
void Run();
diff --git a/chrome/browser/ssl/ssl_cert_error_handler.cc b/chrome/browser/ssl/ssl_cert_error_handler.cc
index d7dddf1..b3d7f87 100644
--- a/chrome/browser/ssl/ssl_cert_error_handler.cc
+++ b/chrome/browser/ssl/ssl_cert_error_handler.cc
@@ -7,6 +7,7 @@
#include "chrome/browser/renderer_host/resource_dispatcher_host.h"
#include "chrome/browser/ssl/ssl_manager.h"
#include "chrome/browser/ssl/ssl_policy.h"
+#include "net/base/x509_certificate.h"
SSLCertErrorHandler::SSLCertErrorHandler(
ResourceDispatcherHost* rdh,
@@ -34,3 +35,5 @@ void SSLCertErrorHandler::OnDispatchFailed() {
void SSLCertErrorHandler::OnDispatched() {
manager_->policy()->OnCertError(this);
}
+
+SSLCertErrorHandler::~SSLCertErrorHandler() {}
diff --git a/chrome/browser/ssl/ssl_cert_error_handler.h b/chrome/browser/ssl/ssl_cert_error_handler.h
index 0584e6a..7a0ca31 100644
--- a/chrome/browser/ssl/ssl_cert_error_handler.h
+++ b/chrome/browser/ssl/ssl_cert_error_handler.h
@@ -10,7 +10,10 @@
#include "chrome/browser/ssl/ssl_error_handler.h"
#include "net/base/ssl_info.h"
-#include "net/base/x509_certificate.h"
+
+namespace net {
+class X509Certificate;
+}
// A CertError represents an error that occurred with the certificate in an
// SSL session. A CertError object exists both on the IO thread and on the UI
@@ -38,7 +41,7 @@ class SSLCertErrorHandler : public SSLErrorHandler {
virtual void OnDispatched();
private:
- ~SSLCertErrorHandler() {}
+ virtual ~SSLCertErrorHandler();
// These read-only members may be accessed on any thread.
net::SSLInfo ssl_info_;
diff --git a/chrome/browser/ssl/ssl_client_auth_handler.h b/chrome/browser/ssl/ssl_client_auth_handler.h
index 852467e..7cdc406 100644
--- a/chrome/browser/ssl/ssl_client_auth_handler.h
+++ b/chrome/browser/ssl/ssl_client_auth_handler.h
@@ -48,7 +48,7 @@ class SSLClientAuthHandler
friend class ChromeThread;
friend class DeleteTask<SSLClientAuthHandler>;
- ~SSLClientAuthHandler();
+ virtual ~SSLClientAuthHandler();
// Notifies that the user has selected a cert.
// Called on the IO thread.
diff --git a/chrome/browser/ssl/ssl_error_handler.cc b/chrome/browser/ssl/ssl_error_handler.cc
index 52792eb..3d37a21 100644
--- a/chrome/browser/ssl/ssl_error_handler.cc
+++ b/chrome/browser/ssl/ssl_error_handler.cc
@@ -46,6 +46,16 @@ SSLErrorHandler::SSLErrorHandler(ResourceDispatcherHost* rdh,
AddRef();
}
+SSLErrorHandler::~SSLErrorHandler() {}
+
+void SSLErrorHandler::OnDispatchFailed() {
+ TakeNoAction();
+}
+
+void SSLErrorHandler::OnDispatched() {
+ TakeNoAction();
+}
+
void SSLErrorHandler::Dispatch() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
diff --git a/chrome/browser/ssl/ssl_error_handler.h b/chrome/browser/ssl/ssl_error_handler.h
index fde764b..383a9f8 100644
--- a/chrome/browser/ssl/ssl_error_handler.h
+++ b/chrome/browser/ssl/ssl_error_handler.h
@@ -93,13 +93,13 @@ class SSLErrorHandler : public base::RefCountedThreadSafe<SSLErrorHandler> {
const std::string& frame_origin,
const std::string& main_frame_origin);
- virtual ~SSLErrorHandler() { }
+ virtual ~SSLErrorHandler();
// The following 2 methods are the methods subclasses should implement.
- virtual void OnDispatchFailed() { TakeNoAction(); }
+ virtual void OnDispatchFailed();
// Can use the manager_ member.
- virtual void OnDispatched() { TakeNoAction(); }
+ virtual void OnDispatched();
// Should only be accessed on the UI thread.
SSLManager* manager_; // Our manager.