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

Unified Diff: content/renderer/media/android/webmediaplayer_android.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/android/webmediaplayer_android.h
diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h
index 92a94a339499a398c5fb68e7a8de1f83d21247bb..4321733d798bc05ba276434d3c53e44e4bcace3c 100644
--- a/content/renderer/media/android/webmediaplayer_android.h
+++ b/content/renderer/media/android/webmediaplayer_android.h
@@ -115,7 +115,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
virtual blink::WebTimeRanges seekable() const;
// Poster image, as defined in the <video> element.
- virtual void setPoster(const blink::WebURL& poster) OVERRIDE;
+ virtual void setPoster(const blink::WebURL& poster) override;
// Methods for painting.
// FIXME: This path "only works" on Android. It is a workaround for the
@@ -174,10 +174,10 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
// cc::VideoFrameProvider implementation. These methods are running on the
// compositor thread.
virtual void SetVideoFrameProviderClient(
- cc::VideoFrameProvider::Client* client) OVERRIDE;
- virtual scoped_refptr<media::VideoFrame> GetCurrentFrame() OVERRIDE;
+ cc::VideoFrameProvider::Client* client) override;
+ virtual scoped_refptr<media::VideoFrame> GetCurrentFrame() override;
virtual void PutCurrentFrame(const scoped_refptr<media::VideoFrame>& frame)
- OVERRIDE;
+ override;
// Media player callback handlers.
void OnMediaMetadataChanged(const base::TimeDelta& duration, int width,
@@ -205,7 +205,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
void OnRemoteRouteAvailabilityChanged(bool routes_available);
// StreamTextureFactoryContextObserver implementation.
- virtual void ResetStreamTextureProxy() OVERRIDE;
+ virtual void ResetStreamTextureProxy() override;
// Called when the player is released.
virtual void OnPlayerReleased();
@@ -216,7 +216,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
virtual void ReleaseMediaResources();
// RenderFrameObserver implementation.
- virtual void OnDestruct() OVERRIDE;
+ virtual void OnDestruct() override;
#if defined(VIDEO_HOLE)
// Calculate the boundary rectangle of the media player (i.e. location and

Powered by Google App Engine
This is Rietveld 408576698