webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc - Issue 2479553006: Remove GetWindowList / GetScreenList and SelectWindow / SelectScreen from WebRTC

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: webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc

Issue 2479553006: Remove GetWindowList / GetScreenList and SelectWindow / SelectScreen from WebRTC (Closed)

Patch Set: Resolve review comments Created 4 years, 1 month 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 | « webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h ('k') | webrtc/modules/desktop_capture/window_capturer_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc

diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc b/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc

index b4256810ca9b56af5f5fd3bbf2087a6263fad30b..96348ca49455bc5f1b0d1ab4b7bf75488f0bffce 100644

--- a/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc

+++ b/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc

@@ -126,11 +126,11 @@ void ScreenCapturerWinMagnifier::CaptureFrame() {

callback_->OnCaptureResult(Result::SUCCESS, std::move(frame));

}

-bool ScreenCapturerWinMagnifier::GetScreenList(ScreenList* screens) {

- return webrtc::GetScreenList(screens);

+bool ScreenCapturerWinMagnifier::GetSourceList(SourceList* sources) {

+ return webrtc::GetScreenList(sources);

}

-bool ScreenCapturerWinMagnifier::SelectScreen(ScreenId id) {

+bool ScreenCapturerWinMagnifier::SelectSource(SourceId id) {

bool valid = IsScreenValid(id, &current_device_key_);

// Set current_screen_id_ even if the fallback capturer is being used, so we