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

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

Issue 26558004: Revert 158219 "Move dom/*Event* to events to match the DOM vs. E..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1651/
Patch Set: Created 7 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 | Annotate | Revision Log
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 16 matching lines...) Expand all
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/v8/Dictionary.h" 34 #include "bindings/v8/Dictionary.h"
35 #include "bindings/v8/ScriptWrappable.h" 35 #include "bindings/v8/ScriptWrappable.h"
36 #include "core/dom/ActiveDOMObject.h" 36 #include "core/dom/ActiveDOMObject.h"
37 #include "core/events/EventTarget.h" 37 #include "core/dom/EventTarget.h"
38 #include "core/platform/Timer.h" 38 #include "core/platform/Timer.h"
39 #include "core/platform/mediastream/RTCPeerConnectionHandler.h" 39 #include "core/platform/mediastream/RTCPeerConnectionHandler.h"
40 #include "core/platform/mediastream/RTCPeerConnectionHandlerClient.h" 40 #include "core/platform/mediastream/RTCPeerConnectionHandlerClient.h"
41 #include "modules/mediastream/MediaStream.h" 41 #include "modules/mediastream/MediaStream.h"
42 #include "modules/mediastream/RTCIceCandidate.h" 42 #include "modules/mediastream/RTCIceCandidate.h"
43 #include "wtf/RefCounted.h" 43 #include "wtf/RefCounted.h"
44 44
45 namespace WebCore { 45 namespace WebCore {
46 46
47 class ExceptionState; 47 class ExceptionState;
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 163
164 Timer<RTCPeerConnection> m_scheduledEventTimer; 164 Timer<RTCPeerConnection> m_scheduledEventTimer;
165 Vector<RefPtr<Event> > m_scheduledEvents; 165 Vector<RefPtr<Event> > m_scheduledEvents;
166 166
167 bool m_stopped; 167 bool m_stopped;
168 }; 168 };
169 169
170 } // namespace WebCore 170 } // namespace WebCore
171 171
172 #endif // RTCPeerConnection_h 172 #endif // RTCPeerConnection_h
OLDNEW
« no previous file with comments | « Source/modules/mediastream/RTCIceCandidateEvent.cpp ('k') | Source/modules/mediastream/RTCPeerConnection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698