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

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

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 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 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_TRACK_EXTRA_DATA_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_TRACK_EXTRA_DATA_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_TRACK_EXTRA_DATA_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_TRACK_EXTRA_DATA_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/threading/thread_checker.h" 11 #include "base/threading/thread_checker.h"
12 #include "content/common/content_export.h" 12 #include "content/common/content_export.h"
13 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 13 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
14 14
15 namespace webrtc { 15 namespace webrtc {
16 class AudioTrackInterface; 16 class AudioTrackInterface;
17 class MediaStreamTrackInterface; 17 class MediaStreamTrackInterface;
18 } // namespace webrtc 18 } // namespace webrtc
19 19
20 namespace content { 20 namespace content {
21 21
22 // MediaStreamTrack is a Chrome representation of blink::WebMediaStreamTrack. 22 // MediaStreamTrack is a Chrome representation of blink::WebMediaStreamTrack.
23 // It is owned by blink::WebMediaStreamTrack as 23 // It is owned by blink::WebMediaStreamTrack as
24 // blink::WebMediaStreamTrack::ExtraData. 24 // blink::WebMediaStreamTrack::ExtraData.
25 class CONTENT_EXPORT MediaStreamTrack 25 class CONTENT_EXPORT MediaStreamTrack
26 : NON_EXPORTED_BASE(public blink::WebMediaStreamTrack::ExtraData) { 26 : NON_EXPORTED_BASE(public blink::WebMediaStreamTrack::ExtraData) {
27 public: 27 public:
28 MediaStreamTrack(webrtc::MediaStreamTrackInterface* track, 28 MediaStreamTrack(
29 bool is_local_track); 29 const scoped_refptr<webrtc::MediaStreamTrackInterface>& track,
30 bool is_local_track);
30 virtual ~MediaStreamTrack(); 31 virtual ~MediaStreamTrack();
31 32
32 static MediaStreamTrack* GetTrack( 33 static MediaStreamTrack* GetTrack(
33 const blink::WebMediaStreamTrack& track); 34 const blink::WebMediaStreamTrack& track);
34 35
35 // If a subclass overrides this method it has to call the base class. 36 // If a subclass overrides this method it has to call the base class.
36 virtual void SetEnabled(bool enabled); 37 virtual void SetEnabled(bool enabled);
37 38
38 virtual void SetMutedState(bool muted_state); 39 virtual void SetMutedState(bool muted_state);
39 virtual bool GetMutedState(void) const; 40 virtual bool GetMutedState(void) const;
(...skipping 16 matching lines...) Expand all
56 const bool is_local_track_; 57 const bool is_local_track_;
57 58
58 base::ThreadChecker thread_checker_; 59 base::ThreadChecker thread_checker_;
59 60
60 DISALLOW_COPY_AND_ASSIGN(MediaStreamTrack); 61 DISALLOW_COPY_AND_ASSIGN(MediaStreamTrack);
61 }; 62 };
62 63
63 } // namespace content 64 } // namespace content
64 65
65 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_TRACK_EXTRA_DATA_H_ 66 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_TRACK_EXTRA_DATA_H_
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_audio_source.h ('k') | content/renderer/media/media_stream_track.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698