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

Side by Side Diff: content/renderer/media/media_stream_dependency_factory.h

Issue 15875005: Forwarding app URL to handler host for WebRTC logs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Code review + rebase. Created 7 years, 6 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 // 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_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 bool CreatePeerConnectionFactory(); 190 bool CreatePeerConnectionFactory();
191 191
192 void InitializeWorkerThread(talk_base::Thread** thread, 192 void InitializeWorkerThread(talk_base::Thread** thread,
193 base::WaitableEvent* event); 193 base::WaitableEvent* event);
194 194
195 void CreateIpcNetworkManagerOnWorkerThread(base::WaitableEvent* event); 195 void CreateIpcNetworkManagerOnWorkerThread(base::WaitableEvent* event);
196 void DeleteIpcNetworkManager(); 196 void DeleteIpcNetworkManager();
197 void CleanupPeerConnectionFactory(); 197 void CleanupPeerConnectionFactory();
198 198
199 void CreateWebRtcLoggingHandler(WebRtcLoggingMessageFilter* filter, 199 void CreateWebRtcLoggingHandler(WebRtcLoggingMessageFilter* filter,
200 const std::string& app_session_id); 200 const std::string& app_session_id,
201 const std::string& app_url);
201 202
202 // We own network_manager_, must be deleted on the worker thread. 203 // We own network_manager_, must be deleted on the worker thread.
203 // The network manager uses |p2p_socket_dispatcher_|. 204 // The network manager uses |p2p_socket_dispatcher_|.
204 IpcNetworkManager* network_manager_; 205 IpcNetworkManager* network_manager_;
205 scoped_ptr<IpcPacketSocketFactory> socket_factory_; 206 scoped_ptr<IpcPacketSocketFactory> socket_factory_;
206 207
207 scoped_refptr<webrtc::PeerConnectionFactoryInterface> pc_factory_; 208 scoped_refptr<webrtc::PeerConnectionFactoryInterface> pc_factory_;
208 209
209 scoped_refptr<VideoCaptureImplManager> vc_manager_; 210 scoped_refptr<VideoCaptureImplManager> vc_manager_;
210 scoped_refptr<P2PSocketDispatcher> p2p_socket_dispatcher_; 211 scoped_refptr<P2PSocketDispatcher> p2p_socket_dispatcher_;
211 scoped_refptr<WebRtcAudioDeviceImpl> audio_device_; 212 scoped_refptr<WebRtcAudioDeviceImpl> audio_device_;
212 213
213 // PeerConnection threads. signaling_thread_ is created from the 214 // PeerConnection threads. signaling_thread_ is created from the
214 // "current" chrome thread. 215 // "current" chrome thread.
215 talk_base::Thread* signaling_thread_; 216 talk_base::Thread* signaling_thread_;
216 talk_base::Thread* worker_thread_; 217 talk_base::Thread* worker_thread_;
217 base::Thread chrome_worker_thread_; 218 base::Thread chrome_worker_thread_;
218 219
219 bool webrtc_log_open_; 220 bool webrtc_log_open_;
220 221
221 DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory); 222 DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory);
222 }; 223 };
223 224
224 } // namespace content 225 } // namespace content
225 226
226 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ 227 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_
OLDNEW
« no previous file with comments | « content/common/media/webrtc_logging_messages.h ('k') | content/renderer/media/media_stream_dependency_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698