| Index: content/renderer/pepper/pepper_media_stream_video_track_host.h
|
| diff --git a/content/renderer/pepper/pepper_media_stream_video_track_host.h b/content/renderer/pepper/pepper_media_stream_video_track_host.h
|
| index b252ff9bff57c89e31024e3d365993271d738466..1ed805245503ec4d95d178c696a0e8277f365981 100644
|
| --- a/content/renderer/pepper/pepper_media_stream_video_track_host.h
|
| +++ b/content/renderer/pepper/pepper_media_stream_video_track_host.h
|
| @@ -37,7 +37,7 @@ class PepperMediaStreamVideoTrackHost : public PepperMediaStreamTrackHostBase,
|
| PP_Instance instance,
|
| PP_Resource resource);
|
|
|
| - virtual bool IsMediaStreamVideoTrackHost() override;
|
| + bool IsMediaStreamVideoTrackHost() override;
|
|
|
| blink::WebMediaStreamTrack track() { return track_; }
|
|
|
| @@ -48,9 +48,9 @@ class PepperMediaStreamVideoTrackHost : public PepperMediaStreamTrackHostBase,
|
| void InitBuffers();
|
|
|
| // PepperMediaStreamTrackHostBase overrides:
|
| - virtual void OnClose() override;
|
| - virtual int32_t OnHostMsgEnqueueBuffer(
|
| - ppapi::host::HostMessageContext* context, int32_t index) override;
|
| + void OnClose() override;
|
| + int32_t OnHostMsgEnqueueBuffer(ppapi::host::HostMessageContext* context,
|
| + int32_t index) override;
|
|
|
| // Sends frame with |index| to |track_|.
|
| int32_t SendFrameToTrack(int32_t index);
|
| @@ -60,23 +60,23 @@ class PepperMediaStreamVideoTrackHost : public PepperMediaStreamTrackHostBase,
|
| const base::TimeTicks& estimated_capture_time);
|
|
|
| // MediaStreamVideoSource overrides:
|
| - virtual void GetCurrentSupportedFormats(
|
| + void GetCurrentSupportedFormats(
|
| int max_requested_width,
|
| int max_requested_height,
|
| double max_requested_frame_rate,
|
| const VideoCaptureDeviceFormatsCB& callback) override;
|
|
|
| - virtual void StartSourceImpl(
|
| + void StartSourceImpl(
|
| const media::VideoCaptureFormat& format,
|
| const VideoCaptureDeliverFrameCB& frame_callback) override;
|
|
|
| - virtual void StopSourceImpl() override;
|
| + void StopSourceImpl() override;
|
|
|
| // ResourceHost overrides:
|
| - virtual void DidConnectPendingHostToResource() override;
|
| + void DidConnectPendingHostToResource() override;
|
|
|
| // ResourceMessageHandler overrides:
|
| - virtual int32_t OnResourceMessageReceived(
|
| + int32_t OnResourceMessageReceived(
|
| const IPC::Message& msg,
|
| ppapi::host::HostMessageContext* context) override;
|
|
|
|
|