summaryrefslogtreecommitdiffstats
path: root/media/tools/player_x11
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 17:37:50 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 17:37:50 +0000
commitbd3f4c32fb047a180daedd47becac1805bd2256b (patch)
tree348da5398f3bf13541685d23eb9424257c1787fe /media/tools/player_x11
parentc729db8b8a70750c6e4a3f9b8e4faa1468089246 (diff)
downloadchromium_src-bd3f4c32fb047a180daedd47becac1805bd2256b.zip
chromium_src-bd3f4c32fb047a180daedd47becac1805bd2256b.tar.gz
chromium_src-bd3f4c32fb047a180daedd47becac1805bd2256b.tar.bz2
Add OVERRIDE to media/.
BUG=104314 TEST=no change Review URL: http://codereview.chromium.org/8634013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111364 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools/player_x11')
-rw-r--r--media/tools/player_x11/gl_video_renderer.h7
-rw-r--r--media/tools/player_x11/x11_video_renderer.h7
2 files changed, 8 insertions, 6 deletions
diff --git a/media/tools/player_x11/gl_video_renderer.h b/media/tools/player_x11/gl_video_renderer.h
index bda881d..211747c 100644
--- a/media/tools/player_x11/gl_video_renderer.h
+++ b/media/tools/player_x11/gl_video_renderer.h
@@ -5,6 +5,7 @@
#ifndef MEDIA_TOOLS_PLAYER_X11_GL_VIDEO_RENDERER_H_
#define MEDIA_TOOLS_PLAYER_X11_GL_VIDEO_RENDERER_H_
+#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "media/filters/video_renderer_base.h"
#include "ui/gfx/gl/gl_bindings.h"
@@ -18,9 +19,9 @@ class GlVideoRenderer : public media::VideoRendererBase {
protected:
// VideoRendererBase implementation.
- virtual bool OnInitialize(media::VideoDecoder* decoder);
- virtual void OnStop(const base::Closure& callback);
- virtual void OnFrameAvailable();
+ virtual bool OnInitialize(media::VideoDecoder* decoder) OVERRIDE;
+ virtual void OnStop(const base::Closure& callback) OVERRIDE;
+ virtual void OnFrameAvailable() OVERRIDE;
private:
// Only allow to be deleted by reference counting.
diff --git a/media/tools/player_x11/x11_video_renderer.h b/media/tools/player_x11/x11_video_renderer.h
index 16640f4..667b2cf 100644
--- a/media/tools/player_x11/x11_video_renderer.h
+++ b/media/tools/player_x11/x11_video_renderer.h
@@ -7,6 +7,7 @@
#include <X11/Xlib.h>
+#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "media/filters/video_renderer_base.h"
@@ -19,9 +20,9 @@ class X11VideoRenderer : public media::VideoRendererBase {
protected:
// VideoRendererBase implementation.
- virtual bool OnInitialize(media::VideoDecoder* decoder);
- virtual void OnStop(const base::Closure& callback);
- virtual void OnFrameAvailable();
+ virtual bool OnInitialize(media::VideoDecoder* decoder) OVERRIDE;
+ virtual void OnStop(const base::Closure& callback) OVERRIDE;
+ virtual void OnFrameAvailable() OVERRIDE;
private:
// Only allow to be deleted by reference counting.