content/renderer/pepper/pepper_media_device_manager.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_device_manager.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_in_process_router.cc ('k') | content/renderer/pepper/pepper_media_stream_audio_track_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/pepper/pepper_media_device_manager.h

diff --git a/content/renderer/pepper/pepper_media_device_manager.h b/content/renderer/pepper/pepper_media_device_manager.h

index b3d94e07040aee2fb7ccfa8faa82a23267973ca8..ef2df60d5e17913eda052943bf14b4f1496951ca 100644

--- a/content/renderer/pepper/pepper_media_device_manager.h

+++ b/content/renderer/pepper/pepper_media_device_manager.h

@@ -30,8 +30,8 @@ class PepperMediaDeviceManager

virtual int EnumerateDevices(PP_DeviceType_Dev type,

const GURL& document_url,

const EnumerateDevicesCallback& callback)

- OVERRIDE;

- virtual void StopEnumerateDevices(int request_id) OVERRIDE;

+ override;

+ virtual void StopEnumerateDevices(int request_id) override;

typedef base::Callback<void(int /* request_id */,

bool /* succeeded */,

@@ -59,19 +59,19 @@ class PepperMediaDeviceManager

int request_id,

const std::string& label,

const StreamDeviceInfoArray& audio_device_array,

- const StreamDeviceInfoArray& video_device_array) OVERRIDE;

+ const StreamDeviceInfoArray& video_device_array) override;

virtual void OnStreamGenerationFailed(

int request_id,

- content::MediaStreamRequestResult result) OVERRIDE;

+ content::MediaStreamRequestResult result) override;

virtual void OnDeviceStopped(const std::string& label,

- const StreamDeviceInfo& device_info) OVERRIDE;

+ const StreamDeviceInfo& device_info) override;

virtual void OnDevicesEnumerated(int request_id,

const StreamDeviceInfoArray& device_array)

- OVERRIDE;

+ override;

virtual void OnDeviceOpened(int request_id,

const std::string& label,

- const StreamDeviceInfo& device_info) OVERRIDE;

- virtual void OnDeviceOpenFailed(int request_id) OVERRIDE;

+ const StreamDeviceInfo& device_info) override;

+ virtual void OnDeviceOpenFailed(int request_id) override;

// Stream type conversion.

static MediaStreamType FromPepperDeviceType(PP_DeviceType_Dev type);