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

Unified Diff: content/browser/media/android/browser_media_player_manager.h

Issue 884103004: Update {virtual,override,final} to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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/browser/media/android/browser_media_player_manager.h
diff --git a/content/browser/media/android/browser_media_player_manager.h b/content/browser/media/android/browser_media_player_manager.h
index 3925eeba96f1058479738cc788a3e25c573b3de6..e0a40132bea994a8a825ce5050ea353b488f3675 100644
--- a/content/browser/media/android/browser_media_player_manager.h
+++ b/content/browser/media/android/browser_media_player_manager.h
@@ -54,7 +54,7 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
ContentViewCoreImpl* GetContentViewCore() const;
- virtual ~BrowserMediaPlayerManager();
+ ~BrowserMediaPlayerManager() override;
// Fullscreen video playback controls.
virtual void ExitFullscreen(bool release_media_player);
@@ -68,32 +68,28 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
void ReleaseAllMediaPlayers();
// media::MediaPlayerManager overrides.
- virtual void OnTimeUpdate(
- int player_id,
- base::TimeDelta current_timestamp,
- base::TimeTicks current_time_ticks) override;
- virtual void OnMediaMetadataChanged(
- int player_id,
- base::TimeDelta duration,
- int width,
- int height,
- bool success) override;
- virtual void OnPlaybackComplete(int player_id) override;
- virtual void OnMediaInterrupted(int player_id) override;
- virtual void OnBufferingUpdate(int player_id, int percentage) override;
- virtual void OnSeekComplete(
- int player_id,
- const base::TimeDelta& current_time) override;
- virtual void OnError(int player_id, int error) override;
- virtual void OnVideoSizeChanged(
- int player_id, int width, int height) override;
- virtual media::MediaResourceGetter* GetMediaResourceGetter() override;
- virtual media::MediaUrlInterceptor* GetMediaUrlInterceptor() override;
- virtual media::MediaPlayerAndroid* GetFullscreenPlayer() override;
- virtual media::MediaPlayerAndroid* GetPlayer(int player_id) override;
- virtual void RequestFullScreen(int player_id) override;
+ void OnTimeUpdate(int player_id,
+ base::TimeDelta current_timestamp,
+ base::TimeTicks current_time_ticks) override;
+ void OnMediaMetadataChanged(int player_id,
+ base::TimeDelta duration,
+ int width,
+ int height,
+ bool success) override;
+ void OnPlaybackComplete(int player_id) override;
+ void OnMediaInterrupted(int player_id) override;
+ void OnBufferingUpdate(int player_id, int percentage) override;
+ void OnSeekComplete(int player_id,
+ const base::TimeDelta& current_time) override;
+ void OnError(int player_id, int error) override;
+ void OnVideoSizeChanged(int player_id, int width, int height) override;
+ media::MediaResourceGetter* GetMediaResourceGetter() override;
+ media::MediaUrlInterceptor* GetMediaUrlInterceptor() override;
+ media::MediaPlayerAndroid* GetFullscreenPlayer() override;
+ media::MediaPlayerAndroid* GetPlayer(int player_id) override;
+ void RequestFullScreen(int player_id) override;
#if defined(VIDEO_HOLE)
- virtual bool ShouldUseVideoOverlayForEmbeddedEncryptedVideo() override;
+ bool ShouldUseVideoOverlayForEmbeddedEncryptedVideo() override;
void AttachExternalVideoSurface(int player_id, jobject surface);
void DetachExternalVideoSurface(int player_id);
« no previous file with comments | « content/browser/media/android/browser_demuxer_android.cc ('k') | content/browser/media/android/media_resource_getter_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698