| Index: ppapi/proxy/video_capture_resource.h
|
| diff --git a/ppapi/proxy/video_capture_resource.h b/ppapi/proxy/video_capture_resource.h
|
| index d0ea0a75b97c7dbe444c5c0475ed9c10dfa097e7..add971361294175db7fe619c0c3598cae4348f7b 100644
|
| --- a/ppapi/proxy/video_capture_resource.h
|
| +++ b/ppapi/proxy/video_capture_resource.h
|
| @@ -21,33 +21,33 @@ class VideoCaptureResource
|
| VideoCaptureResource(Connection connection,
|
| PP_Instance instance,
|
| PluginDispatcher* dispatcher);
|
| - virtual ~VideoCaptureResource();
|
| + ~VideoCaptureResource() override;
|
|
|
| // PluginResource override.
|
| - virtual thunk::PPB_VideoCapture_API* AsPPB_VideoCapture_API() override {
|
| + thunk::PPB_VideoCapture_API* AsPPB_VideoCapture_API() override {
|
| return this;
|
| }
|
|
|
| // PPB_VideoCapture_API implementation.
|
| - virtual int32_t EnumerateDevices(
|
| + int32_t EnumerateDevices(
|
| const PP_ArrayOutput& output,
|
| scoped_refptr<TrackedCallback> callback) override;
|
| - virtual int32_t MonitorDeviceChange(
|
| + int32_t MonitorDeviceChange(
|
| PP_MonitorDeviceChangeCallback callback,
|
| 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;
|
| + int32_t Open(const std::string& device_id,
|
| + const PP_VideoCaptureDeviceInfo_Dev& requested_info,
|
| + uint32_t buffer_count,
|
| + scoped_refptr<TrackedCallback> callback) override;
|
| + int32_t StartCapture() override;
|
| + int32_t ReuseBuffer(uint32_t buffer) override;
|
| + int32_t StopCapture() override;
|
| + void Close() override;
|
| + int32_t EnumerateDevicesSync(const PP_ArrayOutput& devices) override;
|
|
|
| protected:
|
| // Resource override.
|
| - virtual void LastPluginRefWasDeleted() override;
|
| + void LastPluginRefWasDeleted() override;
|
|
|
| private:
|
| enum OpenState {
|
| @@ -57,8 +57,8 @@ class VideoCaptureResource
|
| };
|
|
|
| // PluginResource overrides.
|
| - virtual void OnReplyReceived(const ResourceMessageReplyParams& params,
|
| - const IPC::Message& msg) override;
|
| + void OnReplyReceived(const ResourceMessageReplyParams& params,
|
| + const IPC::Message& msg) override;
|
|
|
| void OnPluginMsgOnDeviceInfo(const ResourceMessageReplyParams& params,
|
| const struct PP_VideoCaptureDeviceInfo_Dev& info,
|
|
|