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

Side by Side Diff: talk/app/webrtc/statscollector.h

Issue 1460483005: Removed dummy "mediastreamsignaling.h" (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « talk/app/webrtc/mediastreamsignaling.cc ('k') | talk/app/webrtc/statscollector_unittest.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 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 18 matching lines...) Expand all
29 // libjingle PeerConnection. 29 // libjingle PeerConnection.
30 30
31 #ifndef TALK_APP_WEBRTC_STATSCOLLECTOR_H_ 31 #ifndef TALK_APP_WEBRTC_STATSCOLLECTOR_H_
32 #define TALK_APP_WEBRTC_STATSCOLLECTOR_H_ 32 #define TALK_APP_WEBRTC_STATSCOLLECTOR_H_
33 33
34 #include <map> 34 #include <map>
35 #include <string> 35 #include <string>
36 #include <vector> 36 #include <vector>
37 37
38 #include "talk/app/webrtc/mediastreaminterface.h" 38 #include "talk/app/webrtc/mediastreaminterface.h"
39 #include "talk/app/webrtc/mediastreamsignaling.h"
40 #include "talk/app/webrtc/peerconnectioninterface.h" 39 #include "talk/app/webrtc/peerconnectioninterface.h"
41 #include "talk/app/webrtc/statstypes.h" 40 #include "talk/app/webrtc/statstypes.h"
42 #include "talk/app/webrtc/webrtcsession.h" 41 #include "talk/app/webrtc/webrtcsession.h"
43 42
44 namespace webrtc { 43 namespace webrtc {
45 44
46 class PeerConnection; 45 class PeerConnection;
47 46
48 // Conversion function to convert candidate type string to the corresponding one 47 // Conversion function to convert candidate type string to the corresponding one
49 // from enum RTCStatsIceCandidateType. 48 // from enum RTCStatsIceCandidateType.
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 // TODO(tommi): We appear to be holding on to raw pointers to reference 160 // TODO(tommi): We appear to be holding on to raw pointers to reference
162 // counted objects? We should be using scoped_refptr here. 161 // counted objects? We should be using scoped_refptr here.
163 typedef std::vector<std::pair<AudioTrackInterface*, uint32_t> > 162 typedef std::vector<std::pair<AudioTrackInterface*, uint32_t> >
164 LocalAudioTrackVector; 163 LocalAudioTrackVector;
165 LocalAudioTrackVector local_audio_tracks_; 164 LocalAudioTrackVector local_audio_tracks_;
166 }; 165 };
167 166
168 } // namespace webrtc 167 } // namespace webrtc
169 168
170 #endif // TALK_APP_WEBRTC_STATSCOLLECTOR_H_ 169 #endif // TALK_APP_WEBRTC_STATSCOLLECTOR_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/mediastreamsignaling.cc ('k') | talk/app/webrtc/statscollector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698