Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(691)

Unified Diff: webrtc/modules/desktop_capture/screen_capturer_x11.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
Index: webrtc/modules/desktop_capture/screen_capturer_x11.cc
diff --git a/webrtc/modules/desktop_capture/screen_capturer_x11.cc b/webrtc/modules/desktop_capture/screen_capturer_x11.cc
index fb8446ea4111c2f31d93e287f58cd8285a5f4d91..1bd2d411df3c38de7844e9a4d75417a34fc8ec4a 100644
--- a/webrtc/modules/desktop_capture/screen_capturer_x11.cc
+++ b/webrtc/modules/desktop_capture/screen_capturer_x11.cc
@@ -55,10 +55,8 @@ class ScreenCapturerLinux : public ScreenCapturer,
// DesktopCapturer interface.
void Start(Callback* delegate) override;
void CaptureFrame() override;
-
- // ScreenCapturer interface.
- bool GetScreenList(ScreenList* screens) override;
- bool SelectScreen(ScreenId id) override;
+ bool GetSourceList(SourceList* sources) override;
+ bool SelectSource(SourceId id) override;
private:
Display* display() { return options_.x_display()->display(); }
@@ -267,16 +265,14 @@ void ScreenCapturerLinux::CaptureFrame() {
callback_->OnCaptureResult(Result::SUCCESS, std::move(result));
}
-bool ScreenCapturerLinux::GetScreenList(ScreenList* screens) {
- RTC_DCHECK(screens->size() == 0);
+bool ScreenCapturerLinux::GetSourceList(SourceList* sources) {
+ RTC_DCHECK(sources->size() == 0);
// TODO(jiayl): implement screen enumeration.
- Screen default_screen;
- default_screen.id = 0;
- screens->push_back(default_screen);
+ sources->push_back({0});
return true;
}
-bool ScreenCapturerLinux::SelectScreen(ScreenId id) {
+bool ScreenCapturerLinux::SelectSource(SourceId id) {
// TODO(jiayl): implement screen selection.
return true;
}

Powered by Google App Engine
This is Rietveld 408576698