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

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

Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545 (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rolling to webrtc@11548 instead to pull in a fix Created 4 years, 10 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 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_PEER_CONNECTION_TRACKER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_PEER_CONNECTION_TRACKER_H_
6 #define CONTENT_RENDERER_MEDIA_PEER_CONNECTION_TRACKER_H_ 6 #define CONTENT_RENDERER_MEDIA_PEER_CONNECTION_TRACKER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "base/threading/thread_checker.h" 13 #include "base/threading/thread_checker.h"
14 #include "content/public/renderer/render_process_observer.h" 14 #include "content/public/renderer/render_process_observer.h"
15 #include "third_party/WebKit/public/platform/WebMediaStream.h" 15 #include "third_party/WebKit/public/platform/WebMediaStream.h"
16 #include "third_party/WebKit/public/platform/WebRTCPeerConnectionHandlerClient.h " 16 #include "third_party/WebKit/public/platform/WebRTCPeerConnectionHandlerClient.h "
17 #include "third_party/WebKit/public/platform/WebRTCSessionDescription.h" 17 #include "third_party/WebKit/public/platform/WebRTCSessionDescription.h"
18 #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h " 18 #include "third_party/webrtc/api/peerconnectioninterface.h"
19 19
20 namespace blink { 20 namespace blink {
21 class WebFrame; 21 class WebFrame;
22 class WebRTCICECandidate; 22 class WebRTCICECandidate;
23 class WebString; 23 class WebString;
24 class WebRTCSessionDescription; 24 class WebRTCSessionDescription;
25 class WebUserMediaRequest; 25 class WebUserMediaRequest;
26 } // namespace blink 26 } // namespace blink
27 27
28 namespace webrtc { 28 namespace webrtc {
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 // This keeps track of the next available local ID. 198 // This keeps track of the next available local ID.
199 int next_local_id_; 199 int next_local_id_;
200 base::ThreadChecker main_thread_; 200 base::ThreadChecker main_thread_;
201 201
202 DISALLOW_COPY_AND_ASSIGN(PeerConnectionTracker); 202 DISALLOW_COPY_AND_ASSIGN(PeerConnectionTracker);
203 }; 203 };
204 204
205 } // namespace content 205 } // namespace content
206 206
207 #endif // CONTENT_RENDERER_MEDIA_PEER_CONNECTION_TRACKER_H_ 207 #endif // CONTENT_RENDERER_MEDIA_PEER_CONNECTION_TRACKER_H_
OLDNEW
« no previous file with comments | « content/renderer/media/peer_connection_identity_store.h ('k') | content/renderer/media/remote_media_stream_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698