content/renderer/pepper/pepper_media_stream_video_track_host.h - Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/pepper/pepper_media_stream_video_track_host.h

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (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 | « content/renderer/pepper/pepper_media_stream_track_host_base.h ('k') | content/renderer/pepper/pepper_platform_audio_input.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 d05313d520be0f916e308bc0a7b44a4db9d05690..b252ff9bff57c89e31024e3d365993271d738466 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;

+ virtual 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 void OnClose() override;

virtual int32_t OnHostMsgEnqueueBuffer(

- ppapi::host::HostMessageContext* context, int32_t index) OVERRIDE;

+ ppapi::host::HostMessageContext* context, int32_t index) override;

// Sends frame with |index| to |track_|.

int32_t SendFrameToTrack(int32_t index);

@@ -64,21 +64,21 @@ class PepperMediaStreamVideoTrackHost : public PepperMediaStreamTrackHostBase,

int max_requested_width,

int max_requested_height,

double max_requested_frame_rate,

- const VideoCaptureDeviceFormatsCB& callback) OVERRIDE;

+ const VideoCaptureDeviceFormatsCB& callback) override;

virtual void StartSourceImpl(

const media::VideoCaptureFormat& format,

- const VideoCaptureDeliverFrameCB& frame_callback) OVERRIDE;

+ const VideoCaptureDeliverFrameCB& frame_callback) override;

- virtual void StopSourceImpl() OVERRIDE;

+ virtual void StopSourceImpl() override;

// ResourceHost overrides:

- virtual void DidConnectPendingHostToResource() OVERRIDE;

+ virtual void DidConnectPendingHostToResource() override;

// ResourceMessageHandler overrides:

virtual int32_t OnResourceMessageReceived(

const IPC::Message& msg,

- ppapi::host::HostMessageContext* context) OVERRIDE;

+ ppapi::host::HostMessageContext* context) override;

// Message handlers:

int32_t OnHostMsgConfigure(