chrome/browser/media/native_desktop_media_list.cc - Issue 665323004: Standardize usage of virtual/override/final in chrome/browser/media

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: chrome/browser/media/native_desktop_media_list.cc

Issue 665323004: Standardize usage of virtual/override/final in chrome/browser/media (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

« chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc ('K') | « chrome/browser/media/native_desktop_media_list.h ('k') | chrome/browser/media/native_desktop_media_list_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/native_desktop_media_list.cc

diff --git a/chrome/browser/media/native_desktop_media_list.cc b/chrome/browser/media/native_desktop_media_list.cc

index b2f036ed61509f7900f00baa991876a98351f585..49bfb53db7d5458acce5240ee205522756f7ebda 100644

--- a/chrome/browser/media/native_desktop_media_list.cc

+++ b/chrome/browser/media/native_desktop_media_list.cc

@@ -88,7 +88,7 @@ class NativeDesktopMediaList::Worker

Worker(base::WeakPtr<NativeDesktopMediaList> media_list,

scoped_ptr<webrtc::ScreenCapturer> screen_capturer,

scoped_ptr<webrtc::WindowCapturer> window_capturer);

- virtual ~Worker();

+ ~Worker() override;

void Refresh(const gfx::Size& thumbnail_size,

content::DesktopMediaID::Id view_dialog_id);

@@ -97,8 +97,8 @@ class NativeDesktopMediaList::Worker

typedef std::map<DesktopMediaID, uint32> ImageHashesMap;

// webrtc::DesktopCapturer::Callback interface.

- virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) override;

- virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) override;

+ webrtc::SharedMemory* CreateSharedMemory(size_t size) override;

+ void OnCaptureCompleted(webrtc::DesktopFrame* frame) override;

base::WeakPtr<NativeDesktopMediaList> media_list_;