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

Unified Diff: ppapi/proxy/video_capture_resource.h

Issue 630883002: replace OVERRIDE and FINAL with override and final in ppapi/ (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
« no previous file with comments | « ppapi/proxy/url_response_info_resource.h ('k') | ppapi/proxy/video_decoder_resource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/video_capture_resource.h
diff --git a/ppapi/proxy/video_capture_resource.h b/ppapi/proxy/video_capture_resource.h
index 44e415e2d41362385067a8593007e809eae24415..d0ea0a75b97c7dbe444c5c0475ed9c10dfa097e7 100644
--- a/ppapi/proxy/video_capture_resource.h
+++ b/ppapi/proxy/video_capture_resource.h
@@ -24,30 +24,30 @@ class VideoCaptureResource
virtual ~VideoCaptureResource();
// PluginResource override.
- virtual thunk::PPB_VideoCapture_API* AsPPB_VideoCapture_API() OVERRIDE {
+ virtual thunk::PPB_VideoCapture_API* AsPPB_VideoCapture_API() override {
return this;
}
// PPB_VideoCapture_API implementation.
virtual int32_t EnumerateDevices(
const PP_ArrayOutput& output,
- scoped_refptr<TrackedCallback> callback) OVERRIDE;
+ scoped_refptr<TrackedCallback> callback) override;
virtual int32_t MonitorDeviceChange(
PP_MonitorDeviceChangeCallback callback,
- void* user_data) OVERRIDE;
+ void* user_data) override;
virtual int32_t Open(const std::string& device_id,
const PP_VideoCaptureDeviceInfo_Dev& requested_info,
uint32_t buffer_count,
- scoped_refptr<TrackedCallback> callback) OVERRIDE;
- virtual int32_t StartCapture() OVERRIDE;
- virtual int32_t ReuseBuffer(uint32_t buffer) OVERRIDE;
- virtual int32_t StopCapture() OVERRIDE;
- virtual void Close() OVERRIDE;
- virtual int32_t EnumerateDevicesSync(const PP_ArrayOutput& devices) OVERRIDE;
+ scoped_refptr<TrackedCallback> callback) override;
+ virtual int32_t StartCapture() override;
+ virtual int32_t ReuseBuffer(uint32_t buffer) override;
+ virtual int32_t StopCapture() override;
+ virtual void Close() override;
+ virtual int32_t EnumerateDevicesSync(const PP_ArrayOutput& devices) override;
protected:
// Resource override.
- virtual void LastPluginRefWasDeleted() OVERRIDE;
+ virtual void LastPluginRefWasDeleted() override;
private:
enum OpenState {
@@ -58,7 +58,7 @@ class VideoCaptureResource
// PluginResource overrides.
virtual void OnReplyReceived(const ResourceMessageReplyParams& params,
- const IPC::Message& msg) OVERRIDE;
+ const IPC::Message& msg) override;
void OnPluginMsgOnDeviceInfo(const ResourceMessageReplyParams& params,
const struct PP_VideoCaptureDeviceInfo_Dev& info,
« no previous file with comments | « ppapi/proxy/url_response_info_resource.h ('k') | ppapi/proxy/video_decoder_resource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698