| Index: ppapi/proxy/video_decoder_resource.h
|
| diff --git a/ppapi/proxy/video_decoder_resource.h b/ppapi/proxy/video_decoder_resource.h
|
| index a9d8e8d022d7f64e739be82fe960bb900e0aa6b1..2e4ea6d5875d793f6ad938eff831b155faa71083 100644
|
| --- a/ppapi/proxy/video_decoder_resource.h
|
| +++ b/ppapi/proxy/video_decoder_resource.h
|
| @@ -40,31 +40,31 @@ class PPAPI_PROXY_EXPORT VideoDecoderResource
|
| virtual ~VideoDecoderResource();
|
|
|
| // Resource overrides.
|
| - virtual thunk::PPB_VideoDecoder_API* AsPPB_VideoDecoder_API() OVERRIDE;
|
| + virtual thunk::PPB_VideoDecoder_API* AsPPB_VideoDecoder_API() override;
|
|
|
| // PPB_VideoDecoder_API implementation.
|
| virtual int32_t Initialize0_1(
|
| PP_Resource graphics_context,
|
| PP_VideoProfile profile,
|
| PP_Bool allow_software_fallback,
|
| - scoped_refptr<TrackedCallback> callback) OVERRIDE;
|
| + scoped_refptr<TrackedCallback> callback) override;
|
| virtual int32_t Initialize(PP_Resource graphics_context,
|
| PP_VideoProfile profile,
|
| PP_HardwareAcceleration acceleration,
|
| - scoped_refptr<TrackedCallback> callback) OVERRIDE;
|
| + scoped_refptr<TrackedCallback> callback) override;
|
| virtual int32_t Decode(uint32_t decode_id,
|
| uint32_t size,
|
| const void* buffer,
|
| - scoped_refptr<TrackedCallback> callback) OVERRIDE;
|
| + scoped_refptr<TrackedCallback> callback) override;
|
| virtual int32_t GetPicture(PP_VideoPicture* picture,
|
| - scoped_refptr<TrackedCallback> callback) OVERRIDE;
|
| - virtual void RecyclePicture(const PP_VideoPicture* picture) OVERRIDE;
|
| - virtual int32_t Flush(scoped_refptr<TrackedCallback> callback) OVERRIDE;
|
| - virtual int32_t Reset(scoped_refptr<TrackedCallback> callback) OVERRIDE;
|
| + scoped_refptr<TrackedCallback> callback) override;
|
| + virtual void RecyclePicture(const PP_VideoPicture* picture) override;
|
| + virtual int32_t Flush(scoped_refptr<TrackedCallback> callback) override;
|
| + virtual int32_t Reset(scoped_refptr<TrackedCallback> callback) override;
|
|
|
| // PluginResource implementation.
|
| virtual void OnReplyReceived(const ResourceMessageReplyParams& params,
|
| - const IPC::Message& msg) OVERRIDE;
|
| + const IPC::Message& msg) override;
|
|
|
| // Called only by unit tests. This bypasses Graphics3D setup, which doesn't
|
| // work in ppapi::proxy::PluginProxyTest.
|
|
|