diff options
Diffstat (limited to 'jingle/notifier/base/weak_xmpp_client.h')
| -rw-r--r-- | jingle/notifier/base/weak_xmpp_client.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/jingle/notifier/base/weak_xmpp_client.h b/jingle/notifier/base/weak_xmpp_client.h index 491d3d7..4549688 100644 --- a/jingle/notifier/base/weak_xmpp_client.h +++ b/jingle/notifier/base/weak_xmpp_client.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -25,7 +25,7 @@ namespace notifier { // buzz::XmppClient's destructor isn't marked virtual, but it inherits // from talk_base::Task, whose destructor *is* marked virtual, so we // can safely inherit from it. -class WeakXmppClient : public buzz::XmppClient { +class WeakXmppClient : public buzz::XmppClient, public base::NonThreadSafe { public: explicit WeakXmppClient(talk_base::TaskParent* parent); @@ -44,7 +44,6 @@ class WeakXmppClient : public buzz::XmppClient { virtual void Stop() OVERRIDE; private: - base::NonThreadSafe non_thread_safe_; // We use our own WeakPtrFactory instead of inheriting from // SupportsWeakPtr since we want to invalidate in other places // besides the destructor. |