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

Side by Side Diff: Source/modules/rtcpeerconnection/RTCDataChannel.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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 118
119 Timer<RTCDataChannel> m_scheduledEventTimer; 119 Timer<RTCDataChannel> m_scheduledEventTimer;
120 WillBeHeapVector<RefPtrWillBeMember<Event> > m_scheduledEvents; 120 WillBeHeapVector<RefPtrWillBeMember<Event> > m_scheduledEvents;
121 121
122 WeakMember<RTCPeerConnection> m_connection; 122 WeakMember<RTCPeerConnection> m_connection;
123 }; 123 };
124 124
125 } // namespace blink 125 } // namespace blink
126 126
127 #endif // RTCDataChannel_h 127 #endif // RTCDataChannel_h
OLDNEW
« no previous file with comments | « Source/modules/rtcpeerconnection/RTCDTMFToneChangeEvent.idl ('k') | Source/modules/rtcpeerconnection/RTCDataChannel.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698