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

Unified Diff: content/renderer/media/rtc_video_decoder.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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/rtc_video_decoder.h
diff --git a/content/renderer/media/rtc_video_decoder.h b/content/renderer/media/rtc_video_decoder.h
index 8c8a6e3685ada2d6ebab441d54438694f4461b37..f2aff14fb3d83fb1d316a9f798243e0b57c84087 100644
--- a/content/renderer/media/rtc_video_decoder.h
+++ b/content/renderer/media/rtc_video_decoder.h
@@ -56,34 +56,34 @@ class CONTENT_EXPORT RTCVideoDecoder
// webrtc::VideoDecoder implementation.
// Called on WebRTC DecodingThread.
virtual int32_t InitDecode(const webrtc::VideoCodec* codecSettings,
- int32_t numberOfCores) OVERRIDE;
+ int32_t numberOfCores) override;
// Called on WebRTC DecodingThread.
virtual int32_t Decode(
const webrtc::EncodedImage& inputImage,
bool missingFrames,
const webrtc::RTPFragmentationHeader* fragmentation,
const webrtc::CodecSpecificInfo* codecSpecificInfo = NULL,
- int64_t renderTimeMs = -1) OVERRIDE;
+ int64_t renderTimeMs = -1) override;
// Called on WebRTC DecodingThread.
virtual int32_t RegisterDecodeCompleteCallback(
- webrtc::DecodedImageCallback* callback) OVERRIDE;
+ webrtc::DecodedImageCallback* callback) override;
// Called on Chrome_libJingle_WorkerThread. The child thread is blocked while
// this runs.
- virtual int32_t Release() OVERRIDE;
+ virtual int32_t Release() override;
// Called on Chrome_libJingle_WorkerThread. The child thread is blocked while
// this runs.
- virtual int32_t Reset() OVERRIDE;
+ virtual int32_t Reset() override;
// VideoDecodeAccelerator::Client implementation.
virtual void ProvidePictureBuffers(uint32 count,
const gfx::Size& size,
- uint32 texture_target) OVERRIDE;
- virtual void DismissPictureBuffer(int32 id) OVERRIDE;
- virtual void PictureReady(const media::Picture& picture) OVERRIDE;
- virtual void NotifyEndOfBitstreamBuffer(int32 id) OVERRIDE;
- virtual void NotifyFlushDone() OVERRIDE;
- virtual void NotifyResetDone() OVERRIDE;
- virtual void NotifyError(media::VideoDecodeAccelerator::Error error) OVERRIDE;
+ uint32 texture_target) override;
+ virtual void DismissPictureBuffer(int32 id) override;
+ virtual void PictureReady(const media::Picture& picture) override;
+ virtual void NotifyEndOfBitstreamBuffer(int32 id) override;
+ virtual void NotifyFlushDone() override;
+ virtual void NotifyResetDone() override;
+ virtual void NotifyError(media::VideoDecodeAccelerator::Error error) override;
private:
class SHMBuffer;
« no previous file with comments | « content/renderer/media/rtc_peer_connection_handler_unittest.cc ('k') | content/renderer/media/rtc_video_decoder_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698