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

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

Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545 (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rolling to webrtc@11548 instead to pull in a fix Created 4 years, 10 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/threading/non_thread_safe.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/libjingle/source/talk/app/webrtc/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
(...skipping 22 matching lines...) Expand all
50 // |weak_factory_| must be the last member. 50 // |weak_factory_| must be the last member.
51 base::WeakPtrFactory<RtcDtmfSenderHandler> weak_factory_; 51 base::WeakPtrFactory<RtcDtmfSenderHandler> weak_factory_;
52 52
53 DISALLOW_COPY_AND_ASSIGN(RtcDtmfSenderHandler); 53 DISALLOW_COPY_AND_ASSIGN(RtcDtmfSenderHandler);
54 }; 54 };
55 55
56 } // namespace content 56 } // namespace content
57 57
58 #endif // CONTENT_RENDERER_MEDIA_RTC_DTMF_SENDER_HANDLER_H_ 58 #endif // CONTENT_RENDERER_MEDIA_RTC_DTMF_SENDER_HANDLER_H_
59 59
OLDNEW
« no previous file with comments | « content/renderer/media/rtc_data_channel_handler.h ('k') | content/renderer/media/rtc_media_constraints.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698