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

Side by Side Diff: webrtc/pc/mediastream.cc

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 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
« no previous file with comments | « webrtc/pc/mediasession_unittest.cc ('k') | webrtc/pc/mediastream_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 * Copyright 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2011 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/pc/mediastream.h" 11 #include "webrtc/pc/mediastream.h"
12 #include "webrtc/base/checks.h" 12 #include "webrtc/rtc_base/checks.h"
13 #include "webrtc/base/logging.h" 13 #include "webrtc/rtc_base/logging.h"
14 14
15 namespace webrtc { 15 namespace webrtc {
16 16
17 template <class V> 17 template <class V>
18 static typename V::iterator FindTrack(V* vector, 18 static typename V::iterator FindTrack(V* vector,
19 const std::string& track_id) { 19 const std::string& track_id) {
20 typename V::iterator it = vector->begin(); 20 typename V::iterator it = vector->begin();
21 for (; it != vector->end(); ++it) { 21 for (; it != vector->end(); ++it) {
22 if ((*it)->id() == track_id) { 22 if ((*it)->id() == track_id) {
23 break; 23 break;
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 return false; 87 return false;
88 typename TrackVector::iterator it = FindTrack(tracks, track->id()); 88 typename TrackVector::iterator it = FindTrack(tracks, track->id());
89 if (it == tracks->end()) 89 if (it == tracks->end())
90 return false; 90 return false;
91 tracks->erase(it); 91 tracks->erase(it);
92 FireOnChanged(); 92 FireOnChanged();
93 return true; 93 return true;
94 } 94 }
95 95
96 } // namespace webrtc 96 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/pc/mediasession_unittest.cc ('k') | webrtc/pc/mediastream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698