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

Side by Side Diff: content/renderer/media/media_stream.cc

Issue 480233007: Remove implicit conversions from scoped_refptr to T* in content/renderer/media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "content/renderer/media/media_stream.h" 5 #include "content/renderer/media/media_stream.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "third_party/WebKit/public/platform/WebString.h" 8 #include "third_party/WebKit/public/platform/WebString.h"
9 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" 9 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
10 10
(...skipping 22 matching lines...) Expand all
33 : is_local_(false), 33 : is_local_(false),
34 webrtc_media_stream_(webrtc_stream) { 34 webrtc_media_stream_(webrtc_stream) {
35 } 35 }
36 36
37 MediaStream::~MediaStream() { 37 MediaStream::~MediaStream() {
38 DCHECK(observers_.empty()); 38 DCHECK(observers_.empty());
39 } 39 }
40 40
41 webrtc::MediaStreamInterface* MediaStream::GetWebRtcAdapter( 41 webrtc::MediaStreamInterface* MediaStream::GetWebRtcAdapter(
42 const blink::WebMediaStream& stream) { 42 const blink::WebMediaStream& stream) {
43 DCHECK(webrtc_media_stream_); 43 DCHECK(webrtc_media_stream_.get());
44 DCHECK(thread_checker_.CalledOnValidThread()); 44 DCHECK(thread_checker_.CalledOnValidThread());
45 return webrtc_media_stream_.get(); 45 return webrtc_media_stream_.get();
46 } 46 }
47 47
48 void MediaStream::AddObserver(MediaStreamObserver* observer) { 48 void MediaStream::AddObserver(MediaStreamObserver* observer) {
49 DCHECK(thread_checker_.CalledOnValidThread()); 49 DCHECK(thread_checker_.CalledOnValidThread());
50 DCHECK(std::find(observers_.begin(), observers_.end(), observer) == 50 DCHECK(std::find(observers_.begin(), observers_.end(), observer) ==
51 observers_.end()); 51 observers_.end());
52 observers_.push_back(observer); 52 observers_.push_back(observer);
53 } 53 }
(...skipping 18 matching lines...) Expand all
72 bool MediaStream::RemoveTrack(const blink::WebMediaStreamTrack& track) { 72 bool MediaStream::RemoveTrack(const blink::WebMediaStreamTrack& track) {
73 DCHECK(thread_checker_.CalledOnValidThread()); 73 DCHECK(thread_checker_.CalledOnValidThread());
74 for (std::vector<MediaStreamObserver*>::iterator it = observers_.begin(); 74 for (std::vector<MediaStreamObserver*>::iterator it = observers_.begin();
75 it != observers_.end(); ++it) { 75 it != observers_.end(); ++it) {
76 (*it)->TrackRemoved(track); 76 (*it)->TrackRemoved(track);
77 } 77 }
78 return true; 78 return true;
79 } 79 }
80 80
81 } // namespace content 81 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/crypto/pepper_cdm_wrapper_impl.cc ('k') | content/renderer/media/media_stream_audio_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698