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

Side by Side Diff: content/renderer/media/webmediaplayer_ms.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_WEBMEDIAPLAYER_MS_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 112
113 virtual double mediaTimeForTimeValue(double timeValue) const; 113 virtual double mediaTimeForTimeValue(double timeValue) const;
114 114
115 virtual unsigned decodedFrameCount() const; 115 virtual unsigned decodedFrameCount() const;
116 virtual unsigned droppedFrameCount() const; 116 virtual unsigned droppedFrameCount() const;
117 virtual unsigned audioDecodedByteCount() const; 117 virtual unsigned audioDecodedByteCount() const;
118 virtual unsigned videoDecodedByteCount() const; 118 virtual unsigned videoDecodedByteCount() const;
119 119
120 // VideoFrameProvider implementation. 120 // VideoFrameProvider implementation.
121 virtual void SetVideoFrameProviderClient( 121 virtual void SetVideoFrameProviderClient(
122 cc::VideoFrameProvider::Client* client) OVERRIDE; 122 cc::VideoFrameProvider::Client* client) override;
123 virtual scoped_refptr<media::VideoFrame> GetCurrentFrame() OVERRIDE; 123 virtual scoped_refptr<media::VideoFrame> GetCurrentFrame() override;
124 virtual void PutCurrentFrame(const scoped_refptr<media::VideoFrame>& frame) 124 virtual void PutCurrentFrame(const scoped_refptr<media::VideoFrame>& frame)
125 OVERRIDE; 125 override;
126 126
127 private: 127 private:
128 // The callback for VideoFrameProvider to signal a new frame is available. 128 // The callback for VideoFrameProvider to signal a new frame is available.
129 void OnFrameAvailable(const scoped_refptr<media::VideoFrame>& frame); 129 void OnFrameAvailable(const scoped_refptr<media::VideoFrame>& frame);
130 // Need repaint due to state change. 130 // Need repaint due to state change.
131 void RepaintInternal(); 131 void RepaintInternal();
132 132
133 // The callback for source to report error. 133 // The callback for source to report error.
134 void OnSourceError(); 134 void OnSourceError();
135 135
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 scoped_refptr<media::MediaLog> media_log_; 192 scoped_refptr<media::MediaLog> media_log_;
193 193
194 scoped_ptr<MediaStreamRendererFactory> renderer_factory_; 194 scoped_ptr<MediaStreamRendererFactory> renderer_factory_;
195 195
196 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); 196 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS);
197 }; 197 };
198 198
199 } // namespace content 199 } // namespace content
200 200
201 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ 201 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
OLDNEW
« no previous file with comments | « content/renderer/media/webaudio_capturer_source.h ('k') | content/renderer/media/webrtc/media_stream_remote_video_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698