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

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

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_TRACK_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_TRACK_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_TRACK_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_TRACK_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 const blink::WebMediaStreamTrack& track); 42 const blink::WebMediaStreamTrack& track);
43 43
44 // Constructor for video tracks. 44 // Constructor for video tracks.
45 MediaStreamVideoTrack( 45 MediaStreamVideoTrack(
46 MediaStreamVideoSource* source, 46 MediaStreamVideoSource* source,
47 const blink::WebMediaConstraints& constraints, 47 const blink::WebMediaConstraints& constraints,
48 const MediaStreamVideoSource::ConstraintsCallback& callback, 48 const MediaStreamVideoSource::ConstraintsCallback& callback,
49 bool enabled); 49 bool enabled);
50 virtual ~MediaStreamVideoTrack(); 50 virtual ~MediaStreamVideoTrack();
51 51
52 virtual void SetEnabled(bool enabled) OVERRIDE; 52 virtual void SetEnabled(bool enabled) override;
53 53
54 virtual void Stop() OVERRIDE; 54 virtual void Stop() override;
55 55
56 void OnReadyStateChanged(blink::WebMediaStreamSource::ReadyState state); 56 void OnReadyStateChanged(blink::WebMediaStreamSource::ReadyState state);
57 57
58 const blink::WebMediaConstraints& constraints() const { 58 const blink::WebMediaConstraints& constraints() const {
59 return constraints_; 59 return constraints_;
60 } 60 }
61 61
62 protected: 62 protected:
63 // Used to DCHECK that we are called on the correct thread. 63 // Used to DCHECK that we are called on the correct thread.
64 base::ThreadChecker thread_checker_; 64 base::ThreadChecker thread_checker_;
(...skipping 29 matching lines...) Expand all
94 // by the blink::WebMediaStreamSource and is guaranteed to outlive the 94 // by the blink::WebMediaStreamSource and is guaranteed to outlive the
95 // track. 95 // track.
96 MediaStreamVideoSource* source_; 96 MediaStreamVideoSource* source_;
97 97
98 DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoTrack); 98 DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoTrack);
99 }; 99 };
100 100
101 } // namespace content 101 } // namespace content
102 102
103 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_TRACK_H_ 103 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_TRACK_H_
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_video_source.h ('k') | content/renderer/media/media_stream_video_track_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698