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

Side by Side Diff: Source/modules/rtcpeerconnection/RTCPeerConnection.h

Issue 650063002: Move MediaStream and MediaStreamTrack implementation from modules/mediastream to core/mediastream. Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased. Created 6 years, 2 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 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 15 matching lines...) Expand all
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef RTCPeerConnection_h 31 #ifndef RTCPeerConnection_h
32 #define RTCPeerConnection_h 32 #define RTCPeerConnection_h
33 33
34 #include "bindings/core/v8/Dictionary.h" 34 #include "bindings/core/v8/Dictionary.h"
35 #include "core/dom/ActiveDOMObject.h" 35 #include "core/dom/ActiveDOMObject.h"
36 #include "core/mediastream/MediaStream.h"
36 #include "modules/EventTargetModules.h" 37 #include "modules/EventTargetModules.h"
37 #include "modules/mediastream/MediaStream.h" 38 #include "modules/rtcpeerconnection/RTCIceCandidate.h"
38 #include "modules/mediastream/RTCIceCandidate.h"
39 #include "platform/AsyncMethodRunner.h" 39 #include "platform/AsyncMethodRunner.h"
40 #include "public/platform/WebMediaConstraints.h" 40 #include "public/platform/WebMediaConstraints.h"
41 #include "public/platform/WebRTCPeerConnectionHandler.h" 41 #include "public/platform/WebRTCPeerConnectionHandler.h"
42 #include "public/platform/WebRTCPeerConnectionHandlerClient.h" 42 #include "public/platform/WebRTCPeerConnectionHandlerClient.h"
43 43
44 namespace blink { 44 namespace blink {
45 45
46 class ExceptionState; 46 class ExceptionState;
47 class MediaStreamTrack; 47 class MediaStreamTrack;
48 class RTCConfiguration; 48 class RTCConfiguration;
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 AsyncMethodRunner<RTCPeerConnection> m_dispatchScheduledEventRunner; 179 AsyncMethodRunner<RTCPeerConnection> m_dispatchScheduledEventRunner;
180 WillBeHeapVector<RefPtrWillBeMember<Event> > m_scheduledEvents; 180 WillBeHeapVector<RefPtrWillBeMember<Event> > m_scheduledEvents;
181 181
182 bool m_stopped; 182 bool m_stopped;
183 bool m_closed; 183 bool m_closed;
184 }; 184 };
185 185
186 } // namespace blink 186 } // namespace blink
187 187
188 #endif // RTCPeerConnection_h 188 #endif // RTCPeerConnection_h
OLDNEW
« no previous file with comments | « Source/modules/rtcpeerconnection/RTCIceCandidateEvent.idl ('k') | Source/modules/rtcpeerconnection/RTCPeerConnection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698