Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Side by Side Diff: jingle/notifier/base/weak_xmpp_client.h

Issue 2913673003: Replace deprecated base::NonThreadSafe in jingle in favor of SequenceChecker. (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « jingle/glue/task_pump.cc ('k') | jingle/notifier/base/weak_xmpp_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // A thin wrapper around buzz::XmppClient that exposes weak pointers 5 // A thin wrapper around buzz::XmppClient that exposes weak pointers
6 // so that users know when the buzz::XmppClient becomes invalid to use 6 // so that users know when the buzz::XmppClient becomes invalid to use
7 // (not necessarily only at destruction time). 7 // (not necessarily only at destruction time).
8 8
9 #ifndef JINGLE_NOTIFIER_BASE_WEAK_XMPP_CLIENT_H_ 9 #ifndef JINGLE_NOTIFIER_BASE_WEAK_XMPP_CLIENT_H_
10 #define JINGLE_NOTIFIER_BASE_WEAK_XMPP_CLIENT_H_ 10 #define JINGLE_NOTIFIER_BASE_WEAK_XMPP_CLIENT_H_
11 11
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/threading/non_thread_safe.h" 15 #include "base/sequence_checker.h"
16 #include "third_party/libjingle_xmpp/xmpp/xmppclient.h" 16 #include "third_party/libjingle_xmpp/xmpp/xmppclient.h"
17 17
18 namespace rtc { 18 namespace rtc {
19 class TaskParent; 19 class TaskParent;
20 } // namespace 20 } // namespace
21 21
22 namespace notifier { 22 namespace notifier {
23 23
24 // buzz::XmppClient's destructor isn't marked virtual, but it inherits 24 // buzz::XmppClient's destructor isn't marked virtual, but it inherits
25 // from rtc::Task, whose destructor *is* marked virtual, so we 25 // from rtc::Task, whose destructor *is* marked virtual, so we
26 // can safely inherit from it. 26 // can safely inherit from it.
27 class WeakXmppClient : public buzz::XmppClient, public base::NonThreadSafe { 27 class WeakXmppClient : public buzz::XmppClient {
28 public: 28 public:
29 explicit WeakXmppClient(rtc::TaskParent* parent); 29 explicit WeakXmppClient(rtc::TaskParent* parent);
30 30
31 ~WeakXmppClient() override; 31 ~WeakXmppClient() override;
32 32
33 // Returns a weak pointer that is invalidated when the XmppClient 33 // Returns a weak pointer that is invalidated when the XmppClient
34 // becomes invalid to use. 34 // becomes invalid to use.
35 base::WeakPtr<WeakXmppClient> AsWeakPtr(); 35 base::WeakPtr<WeakXmppClient> AsWeakPtr();
36 36
37 // Invalidates all weak pointers to this object. (This method is 37 // Invalidates all weak pointers to this object. (This method is
38 // necessary as calling Abort() does not always lead to Stop() being 38 // necessary as calling Abort() does not always lead to Stop() being
39 // called, so it's not a reliable way to cause an invalidation.) 39 // called, so it's not a reliable way to cause an invalidation.)
40 void Invalidate(); 40 void Invalidate();
41 41
42 protected: 42 protected:
43 void Stop() override; 43 void Stop() override;
44 44
45 private: 45 private:
46 SEQUENCE_CHECKER(sequence_checker_);
47
46 // We use our own WeakPtrFactory instead of inheriting from 48 // We use our own WeakPtrFactory instead of inheriting from
47 // SupportsWeakPtr since we want to invalidate in other places 49 // SupportsWeakPtr since we want to invalidate in other places
48 // besides the destructor. 50 // besides the destructor.
49 base::WeakPtrFactory<WeakXmppClient> weak_ptr_factory_; 51 base::WeakPtrFactory<WeakXmppClient> weak_ptr_factory_;
50 52
51 DISALLOW_COPY_AND_ASSIGN(WeakXmppClient); 53 DISALLOW_COPY_AND_ASSIGN(WeakXmppClient);
52 }; 54 };
53 55
54 } // namespace notifier 56 } // namespace notifier
55 57
56 #endif // JINGLE_NOTIFIER_BASE_WEAK_XMPP_CLIENT_H_ 58 #endif // JINGLE_NOTIFIER_BASE_WEAK_XMPP_CLIENT_H_
OLDNEW
« no previous file with comments | « jingle/glue/task_pump.cc ('k') | jingle/notifier/base/weak_xmpp_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698