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

Side by Side Diff: trunk/src/content/renderer/media/rtc_peer_connection_handler.h

Issue 296213007: Revert 272504 "Destroy all rtc peer connection handlers before s..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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
« no previous file with comments | « no previous file | trunk/src/content/renderer/media/rtc_peer_connection_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_PEER_CONNECTION_HANDLER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_
6 #define CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_ 6 #define CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 // the main render thread. 81 // the main render thread.
82 class CONTENT_EXPORT RTCPeerConnectionHandler 82 class CONTENT_EXPORT RTCPeerConnectionHandler
83 : NON_EXPORTED_BASE(public blink::WebRTCPeerConnectionHandler), 83 : NON_EXPORTED_BASE(public blink::WebRTCPeerConnectionHandler),
84 NON_EXPORTED_BASE(public webrtc::PeerConnectionObserver) { 84 NON_EXPORTED_BASE(public webrtc::PeerConnectionObserver) {
85 public: 85 public:
86 RTCPeerConnectionHandler( 86 RTCPeerConnectionHandler(
87 blink::WebRTCPeerConnectionHandlerClient* client, 87 blink::WebRTCPeerConnectionHandlerClient* client,
88 PeerConnectionDependencyFactory* dependency_factory); 88 PeerConnectionDependencyFactory* dependency_factory);
89 virtual ~RTCPeerConnectionHandler(); 89 virtual ~RTCPeerConnectionHandler();
90 90
91 // Destroy all existing RTCPeerConnectionHandler objects.
92 static void DestructAllHandlers();
93
94 void associateWithFrame(blink::WebFrame* frame); 91 void associateWithFrame(blink::WebFrame* frame);
95 92
96 // Initialize method only used for unit test. 93 // Initialize method only used for unit test.
97 bool InitializeForTest( 94 bool InitializeForTest(
98 const blink::WebRTCConfiguration& server_configuration, 95 const blink::WebRTCConfiguration& server_configuration,
99 const blink::WebMediaConstraints& options, 96 const blink::WebMediaConstraints& options,
100 PeerConnectionTracker* peer_connection_tracker); 97 PeerConnectionTracker* peer_connection_tracker);
101 98
102 // blink::WebRTCPeerConnectionHandler implementation 99 // blink::WebRTCPeerConnectionHandler implementation
103 virtual bool initialize( 100 virtual bool initialize(
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 content::RemoteMediaStreamImpl*> RemoteStreamMap; 209 content::RemoteMediaStreamImpl*> RemoteStreamMap;
213 RemoteStreamMap remote_streams_; 210 RemoteStreamMap remote_streams_;
214 scoped_refptr<webrtc::UMAObserver> uma_observer_; 211 scoped_refptr<webrtc::UMAObserver> uma_observer_;
215 212
216 DISALLOW_COPY_AND_ASSIGN(RTCPeerConnectionHandler); 213 DISALLOW_COPY_AND_ASSIGN(RTCPeerConnectionHandler);
217 }; 214 };
218 215
219 } // namespace content 216 } // namespace content
220 217
221 #endif // CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_ 218 #endif // CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_
OLDNEW
« no previous file with comments | « no previous file | trunk/src/content/renderer/media/rtc_peer_connection_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698