diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 17:37:50 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 17:37:50 +0000 |
commit | bd3f4c32fb047a180daedd47becac1805bd2256b (patch) | |
tree | 348da5398f3bf13541685d23eb9424257c1787fe /media/tools | |
parent | c729db8b8a70750c6e4a3f9b8e4faa1468089246 (diff) | |
download | chromium_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')
-rw-r--r-- | media/tools/player_x11/gl_video_renderer.h | 7 | ||||
-rw-r--r-- | media/tools/player_x11/x11_video_renderer.h | 7 | ||||
-rw-r--r-- | media/tools/shader_bench/cpu_color_painter.h | 5 | ||||
-rw-r--r-- | media/tools/shader_bench/gpu_color_painter.h | 5 | ||||
-rw-r--r-- | media/tools/shader_bench/gpu_color_painter_exp.h | 5 |
5 files changed, 17 insertions, 12 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. diff --git a/media/tools/shader_bench/cpu_color_painter.h b/media/tools/shader_bench/cpu_color_painter.h index 6c0c4d7..b5531e1 100644 --- a/media/tools/shader_bench/cpu_color_painter.h +++ b/media/tools/shader_bench/cpu_color_painter.h @@ -5,6 +5,7 @@ #ifndef MEDIA_TOOLS_SHADER_BENCH_CPU_COLOR_PAINTER_H_ #define MEDIA_TOOLS_SHADER_BENCH_CPU_COLOR_PAINTER_H_ +#include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "media/base/video_frame.h" #include "media/tools/shader_bench/gpu_painter.h" @@ -16,8 +17,8 @@ class CPUColorPainter : public GPUPainter { virtual ~CPUColorPainter(); // Painter interface. - virtual void Initialize(int width, int height); - virtual void Paint(scoped_refptr<media::VideoFrame> video_frame); + virtual void Initialize(int width, int height) OVERRIDE; + virtual void Paint(scoped_refptr<media::VideoFrame> video_frame) OVERRIDE; private: // Shader program id. diff --git a/media/tools/shader_bench/gpu_color_painter.h b/media/tools/shader_bench/gpu_color_painter.h index ab23072..5a000e2 100644 --- a/media/tools/shader_bench/gpu_color_painter.h +++ b/media/tools/shader_bench/gpu_color_painter.h @@ -5,6 +5,7 @@ #ifndef MEDIA_TOOLS_SHADER_BENCH_GPU_COLOR_PAINTER_H_ #define MEDIA_TOOLS_SHADER_BENCH_GPU_COLOR_PAINTER_H_ +#include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "media/base/video_frame.h" #include "media/tools/shader_bench/gpu_painter.h" @@ -18,8 +19,8 @@ class GPUColorWithLuminancePainter : public GPUPainter { virtual ~GPUColorWithLuminancePainter(); // Painter interface. - virtual void Initialize(int width, int height); - virtual void Paint(scoped_refptr<media::VideoFrame> video_frame); + virtual void Initialize(int width, int height) OVERRIDE; + virtual void Paint(scoped_refptr<media::VideoFrame> video_frame) OVERRIDE; private: // Shader program id. diff --git a/media/tools/shader_bench/gpu_color_painter_exp.h b/media/tools/shader_bench/gpu_color_painter_exp.h index b5c6caa..19b3c7e 100644 --- a/media/tools/shader_bench/gpu_color_painter_exp.h +++ b/media/tools/shader_bench/gpu_color_painter_exp.h @@ -5,6 +5,7 @@ #ifndef MEDIA_TOOLS_SHADER_BENCH_GPU_COLOR_PAINTER_EXP_H_ #define MEDIA_TOOLS_SHADER_BENCH_GPU_COLOR_PAINTER_EXP_H_ +#include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "media/base/video_frame.h" #include "media/tools/shader_bench/gpu_painter.h" @@ -19,8 +20,8 @@ class GPUColorRGBALumHackPainter : public GPUPainter { virtual ~GPUColorRGBALumHackPainter(); // Painter interface. - virtual void Initialize(int width, int height); - virtual void Paint(scoped_refptr<media::VideoFrame> video_frame); + virtual void Initialize(int width, int height) OVERRIDE; + virtual void Paint(scoped_refptr<media::VideoFrame> video_frame) OVERRIDE; private: // Shader program id. |