summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/session_manager.h
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 01:06:06 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 01:06:06 +0000
commit512d03f78c442cf31bae077d93ecc4882a46b286 (patch)
tree428c50889d8a1ded265b3dd90775cb300f12e2ae /remoting/protocol/session_manager.h
parent8c672de7d601eba2b337446bb869f08dece73633 (diff)
downloadchromium_src-512d03f78c442cf31bae077d93ecc4882a46b286.zip
chromium_src-512d03f78c442cf31bae077d93ecc4882a46b286.tar.gz
chromium_src-512d03f78c442cf31bae077d93ecc4882a46b286.tar.bz2
RefCounted types should not have public destructors, delegate cleanup
For Delegate/Observer-type classes that specify an interface but do not have any particular lifetime requirements, make their destructors protected. This is to allow their interfaces to be implemented safely by RefCounted types. With public destructors, it's possible to do "scoped_ptr<Delegate> foo", and then assign a RefCountedDelegateImpl, which would lead to a double free. As none of these Delegates actually need public destructors (ownership of the Delegate* is not transferred during a function call / class constructor), mark the destructors protected so that it becomes a compile warning to try to delete them via the Delegate*. BUG=123295 TEST=it compiles Review URL: https://chromiumcodereview.appspot.com/10383262 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144086 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/session_manager.h')
-rw-r--r--remoting/protocol/session_manager.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/remoting/protocol/session_manager.h b/remoting/protocol/session_manager.h
index eb0c9db..fc9645c 100644
--- a/remoting/protocol/session_manager.h
+++ b/remoting/protocol/session_manager.h
@@ -76,8 +76,8 @@ class AuthenticatorFactory;
// client side and one for the host side.
class SessionManager : public base::NonThreadSafe {
public:
- SessionManager() { }
- virtual ~SessionManager() { }
+ SessionManager() {}
+ virtual ~SessionManager() {}
enum IncomingSessionResponse {
// Accept the session.
@@ -97,8 +97,7 @@ class SessionManager : public base::NonThreadSafe {
class Listener {
public:
- Listener() { }
- ~Listener() { }
+ Listener() {}
// Called when the session manager is ready to create outgoing
// sessions. May be called from Init() or after Init()
@@ -115,6 +114,9 @@ class SessionManager : public base::NonThreadSafe {
// The callback must take ownership of the |session| if it ACCEPTs it.
virtual void OnIncomingSession(Session* session,
IncomingSessionResponse* response) = 0;
+
+ protected:
+ ~Listener() {}
};
// Initializes the session client. Caller retains ownership of the