content/browser/renderer_host/media/media_capture_devices_impl.h - Issue 667943003: Standardize usage of virtual/override/final in content/browser/

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/browser/renderer_host/media/media_capture_devices_impl.h

Issue 667943003: Standardize usage of virtual/override/final in content/browser/ (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/browser/renderer_host/media/audio_sync_reader.h ('k') | content/browser/renderer_host/media/media_stream_dispatcher_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/media_capture_devices_impl.h

diff --git a/content/browser/renderer_host/media/media_capture_devices_impl.h b/content/browser/renderer_host/media/media_capture_devices_impl.h

index 8fefa4d917ee6b9d12cc760bd15a20642245c48f..77174cc62054ec3a193c89cbc31a1ae543866cda 100644

--- a/content/browser/renderer_host/media/media_capture_devices_impl.h

+++ b/content/browser/renderer_host/media/media_capture_devices_impl.h

@@ -15,8 +15,8 @@ class MediaCaptureDevicesImpl : public MediaCaptureDevices {

static MediaCaptureDevicesImpl* GetInstance();

// Overriden from MediaCaptureDevices

- virtual const MediaStreamDevices& GetAudioCaptureDevices() override;

- virtual const MediaStreamDevices& GetVideoCaptureDevices() override;

+ const MediaStreamDevices& GetAudioCaptureDevices() override;

+ const MediaStreamDevices& GetVideoCaptureDevices() override;

// Called by MediaStreamManager to notify the change of media capture

// devices, these 2 methods are called in IO thread.

@@ -26,7 +26,7 @@ class MediaCaptureDevicesImpl : public MediaCaptureDevices {

private:

friend struct DefaultSingletonTraits<MediaCaptureDevicesImpl>;

MediaCaptureDevicesImpl();

- virtual ~MediaCaptureDevicesImpl();

+ ~MediaCaptureDevicesImpl() override;

void UpdateAudioDevicesOnUIThread(const content::MediaStreamDevices& devices);

void UpdateVideoDevicesOnUIThread(const content::MediaStreamDevices& devices);