| Index: ppapi/proxy/audio_input_resource.h
|
| diff --git a/ppapi/proxy/audio_input_resource.h b/ppapi/proxy/audio_input_resource.h
|
| index 1d4fc06272c26f8d0182cab9352f28df63e3bc00..a94ff9c5e3e38f4b85c030e90c68b99c13439cdc 100644
|
| --- a/ppapi/proxy/audio_input_resource.h
|
| +++ b/ppapi/proxy/audio_input_resource.h
|
| @@ -31,38 +31,36 @@ class AudioInputResource : public PluginResource,
|
| public base::DelegateSimpleThread::Delegate {
|
| public:
|
| AudioInputResource(Connection connection, PP_Instance instance);
|
| - virtual ~AudioInputResource();
|
| + ~AudioInputResource() override;
|
|
|
| // Resource overrides.
|
| - virtual thunk::PPB_AudioInput_API* AsPPB_AudioInput_API() override;
|
| - virtual void OnReplyReceived(const ResourceMessageReplyParams& params,
|
| - const IPC::Message& msg) override;
|
| + thunk::PPB_AudioInput_API* AsPPB_AudioInput_API() override;
|
| + void OnReplyReceived(const ResourceMessageReplyParams& params,
|
| + const IPC::Message& msg) override;
|
|
|
| // PPB_AudioInput_API implementation.
|
| - virtual int32_t EnumerateDevices(
|
| - const PP_ArrayOutput& output,
|
| - scoped_refptr<TrackedCallback> callback) override;
|
| - virtual int32_t MonitorDeviceChange(
|
| - PP_MonitorDeviceChangeCallback callback,
|
| - void* user_data) override;
|
| - virtual int32_t Open0_3(PP_Resource device_ref,
|
| - PP_Resource config,
|
| - PPB_AudioInput_Callback_0_3 audio_input_callback_0_3,
|
| - void* user_data,
|
| - scoped_refptr<TrackedCallback> callback) override;
|
| - virtual int32_t Open(PP_Resource device_ref,
|
| - PP_Resource config,
|
| - PPB_AudioInput_Callback audio_input_callback,
|
| - void* user_data,
|
| - scoped_refptr<TrackedCallback> callback) override;
|
| - virtual PP_Resource GetCurrentConfig() override;
|
| - virtual PP_Bool StartCapture() override;
|
| - virtual PP_Bool StopCapture() override;
|
| - virtual void Close() override;
|
| + int32_t EnumerateDevices(const PP_ArrayOutput& output,
|
| + scoped_refptr<TrackedCallback> callback) override;
|
| + int32_t MonitorDeviceChange(PP_MonitorDeviceChangeCallback callback,
|
| + void* user_data) override;
|
| + int32_t Open0_3(PP_Resource device_ref,
|
| + PP_Resource config,
|
| + PPB_AudioInput_Callback_0_3 audio_input_callback_0_3,
|
| + void* user_data,
|
| + scoped_refptr<TrackedCallback> callback) override;
|
| + int32_t Open(PP_Resource device_ref,
|
| + PP_Resource config,
|
| + PPB_AudioInput_Callback audio_input_callback,
|
| + void* user_data,
|
| + scoped_refptr<TrackedCallback> callback) override;
|
| + PP_Resource GetCurrentConfig() override;
|
| + PP_Bool StartCapture() override;
|
| + PP_Bool StopCapture() override;
|
| + void Close() override;
|
|
|
| protected:
|
| // Resource override.
|
| - virtual void LastPluginRefWasDeleted() override;
|
| + void LastPluginRefWasDeleted() override;
|
|
|
| private:
|
| enum OpenState {
|
| @@ -87,7 +85,7 @@ class AudioInputResource : public PluginResource,
|
|
|
| // DelegateSimpleThread::Delegate implementation.
|
| // Run on the audio input thread.
|
| - virtual void Run() override;
|
| + void Run() override;
|
|
|
| int32_t CommonOpen(PP_Resource device_ref,
|
| PP_Resource config,
|
|
|