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

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

Issue 515093003: Manual fixups in media code for scoped_refptr operator T* removal. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moar 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 #include "content/renderer/media/media_stream_video_track.h" 5 #include "content/renderer/media/media_stream_video_track.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
10 11
11 namespace content { 12 namespace content {
12 13
13 namespace { 14 namespace {
14 void ResetCallback(scoped_ptr<VideoCaptureDeliverFrameCB> callback) { 15 void ResetCallback(scoped_ptr<VideoCaptureDeliverFrameCB> callback) {
15 // |callback| will be deleted when this exits. 16 // |callback| will be deleted when this exits.
16 } 17 }
17 } // namespace 18 } // namespace
18 19
19 // MediaStreamVideoTrack::FrameDeliverer is a helper class used for registering 20 // MediaStreamVideoTrack::FrameDeliverer is a helper class used for registering
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 DCHECK(thread_checker_.CalledOnValidThread()); 267 DCHECK(thread_checker_.CalledOnValidThread());
267 muted_state_ = muted_state; 268 muted_state_ = muted_state;
268 } 269 }
269 270
270 bool MediaStreamVideoTrack::GetMutedState(void) const { 271 bool MediaStreamVideoTrack::GetMutedState(void) const {
271 DCHECK(thread_checker_.CalledOnValidThread()); 272 DCHECK(thread_checker_.CalledOnValidThread());
272 return muted_state_; 273 return muted_state_;
273 } 274 }
274 275
275 } // namespace content 276 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_track.cc ('k') | content/renderer/media/video_frame_compositor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698