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

Side by Side Diff: content/renderer/media/rtc_dtmf_sender_handler.h

Issue 2909103002: Deprecate NonThreadSafe in content/renderer/media in favor of SequenceChecker. (Closed)
Patch Set: fix compile 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #ifndef CONTENT_RENDERER_MEDIA_RTC_DTMF_SENDER_HANDLER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_RTC_DTMF_SENDER_HANDLER_H_
6 #define CONTENT_RENDERER_MEDIA_RTC_DTMF_SENDER_HANDLER_H_ 6 #define CONTENT_RENDERER_MEDIA_RTC_DTMF_SENDER_HANDLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "base/threading/non_thread_safe.h" 13 #include "base/sequence_checker.h"
14 #include "content/common/content_export.h" 14 #include "content/common/content_export.h"
15 #include "third_party/WebKit/public/platform/WebRTCDTMFSenderHandler.h" 15 #include "third_party/WebKit/public/platform/WebRTCDTMFSenderHandler.h"
16 #include "third_party/WebKit/public/platform/WebRTCDTMFSenderHandlerClient.h" 16 #include "third_party/WebKit/public/platform/WebRTCDTMFSenderHandlerClient.h"
17 #include "third_party/webrtc/api/dtmfsenderinterface.h" 17 #include "third_party/webrtc/api/dtmfsenderinterface.h"
18 18
19 namespace content { 19 namespace content {
20 20
21 // RtcDtmfSenderHandler is a delegate for the RTC DTMF Sender API messages 21 // RtcDtmfSenderHandler is a delegate for the RTC DTMF Sender API messages
22 // going between WebKit and native DTMF Sender in libjingle. 22 // going between WebKit and native DTMF Sender in libjingle.
23 // Instances of this class are owned by WebKit. 23 // Instances of this class are owned by WebKit.
24 // WebKit call all of these methods on the main render thread. 24 // WebKit call all of these methods on the main render thread.
25 // Callbacks to the webrtc::DtmfSenderObserverInterface implementation also 25 // Callbacks to the webrtc::DtmfSenderObserverInterface implementation also
26 // occur on the main render thread. 26 // occur on the main render thread.
27 class CONTENT_EXPORT RtcDtmfSenderHandler 27 class CONTENT_EXPORT RtcDtmfSenderHandler
28 : NON_EXPORTED_BASE(public blink::WebRTCDTMFSenderHandler), 28 : NON_EXPORTED_BASE(public blink::WebRTCDTMFSenderHandler) {
29 NON_EXPORTED_BASE(public base::NonThreadSafe) {
30 public: 29 public:
31 explicit RtcDtmfSenderHandler(webrtc::DtmfSenderInterface* dtmf_sender); 30 explicit RtcDtmfSenderHandler(webrtc::DtmfSenderInterface* dtmf_sender);
32 ~RtcDtmfSenderHandler() override; 31 ~RtcDtmfSenderHandler() override;
33 32
34 // blink::WebRTCDTMFSenderHandler implementation. 33 // blink::WebRTCDTMFSenderHandler implementation.
35 void SetClient(blink::WebRTCDTMFSenderHandlerClient* client) override; 34 void SetClient(blink::WebRTCDTMFSenderHandlerClient* client) override;
36 blink::WebString CurrentToneBuffer() override; 35 blink::WebString CurrentToneBuffer() override;
37 bool CanInsertDTMF() override; 36 bool CanInsertDTMF() override;
38 bool InsertDTMF(const blink::WebString& tones, 37 bool InsertDTMF(const blink::WebString& tones,
39 long duration, 38 long duration,
40 long interToneGap) override; 39 long interToneGap) override;
41 40
42 void OnToneChange(const std::string& tone); 41 void OnToneChange(const std::string& tone);
43 42
44 private: 43 private:
45 scoped_refptr<webrtc::DtmfSenderInterface> dtmf_sender_; 44 scoped_refptr<webrtc::DtmfSenderInterface> dtmf_sender_;
46 blink::WebRTCDTMFSenderHandlerClient* webkit_client_; 45 blink::WebRTCDTMFSenderHandlerClient* webkit_client_;
47 class Observer; 46 class Observer;
48 scoped_refptr<Observer> observer_; 47 scoped_refptr<Observer> observer_;
49 48
49 SEQUENCE_CHECKER(sequence_checker_);
50
50 // |weak_factory_| must be the last member. 51 // |weak_factory_| must be the last member.
51 base::WeakPtrFactory<RtcDtmfSenderHandler> weak_factory_; 52 base::WeakPtrFactory<RtcDtmfSenderHandler> weak_factory_;
52 53
53 DISALLOW_COPY_AND_ASSIGN(RtcDtmfSenderHandler); 54 DISALLOW_COPY_AND_ASSIGN(RtcDtmfSenderHandler);
54 }; 55 };
55 56
56 } // namespace content 57 } // namespace content
57 58
58 #endif // CONTENT_RENDERER_MEDIA_RTC_DTMF_SENDER_HANDLER_H_ 59 #endif // CONTENT_RENDERER_MEDIA_RTC_DTMF_SENDER_HANDLER_H_
59
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698