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

Side by Side Diff: content/renderer/media/rtc_data_channel_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) 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 #ifndef CONTENT_RENDERER_MEDIA_RTC_DATA_CHANNEL_HANDLER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_RTC_DATA_CHANNEL_HANDLER_H_
6 #define CONTENT_RENDERER_MEDIA_RTC_DATA_CHANNEL_HANDLER_H_ 6 #define CONTENT_RENDERER_MEDIA_RTC_DATA_CHANNEL_HANDLER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
14 #include "base/threading/thread_checker.h" 14 #include "base/threading/thread_checker.h"
15 #include "content/common/content_export.h" 15 #include "content/common/content_export.h"
16 #include "third_party/WebKit/public/platform/WebRTCDataChannelHandler.h" 16 #include "third_party/WebKit/public/platform/WebRTCDataChannelHandler.h"
17 #include "third_party/WebKit/public/platform/WebRTCDataChannelHandlerClient.h" 17 #include "third_party/WebKit/public/platform/WebRTCDataChannelHandlerClient.h"
18 #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h " 18 #include "third_party/webrtc/api/peerconnectioninterface.h"
19 19
20 namespace content { 20 namespace content {
21 21
22 // RtcDataChannelHandler is a delegate for the RTC PeerConnection DataChannel 22 // RtcDataChannelHandler is a delegate for the RTC PeerConnection DataChannel
23 // API messages going between WebKit and native PeerConnection DataChannels in 23 // API messages going between WebKit and native PeerConnection DataChannels in
24 // libjingle. Instances of this class are owned by WebKit. 24 // libjingle. Instances of this class are owned by WebKit.
25 // WebKit call all of these methods on the main render thread. 25 // WebKit call all of these methods on the main render thread.
26 // Callbacks to the webrtc::DataChannelObserver implementation also occur on 26 // Callbacks to the webrtc::DataChannelObserver implementation also occur on
27 // the main render thread. 27 // the main render thread.
28 class CONTENT_EXPORT RtcDataChannelHandler 28 class CONTENT_EXPORT RtcDataChannelHandler
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 104
105 scoped_refptr<Observer> observer_; 105 scoped_refptr<Observer> observer_;
106 base::ThreadChecker thread_checker_; 106 base::ThreadChecker thread_checker_;
107 107
108 blink::WebRTCDataChannelHandlerClient* webkit_client_; 108 blink::WebRTCDataChannelHandlerClient* webkit_client_;
109 }; 109 };
110 110
111 } // namespace content 111 } // namespace content
112 112
113 #endif // CONTENT_RENDERER_MEDIA_RTC_DATA_CHANNEL_HANDLER_H_ 113 #endif // CONTENT_RENDERER_MEDIA_RTC_DATA_CHANNEL_HANDLER_H_
OLDNEW
« no previous file with comments | « content/renderer/media/remote_media_stream_impl.h ('k') | content/renderer/media/rtc_dtmf_sender_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698