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

Unified Diff: content/browser/media/capture/desktop_capture_device.cc

Issue 2480203002: ui: Cleanup class/struct forward declarations (Closed)
Patch Set: Sync CL to position 430550 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: content/browser/media/capture/desktop_capture_device.cc
diff --git a/content/browser/media/capture/desktop_capture_device.cc b/content/browser/media/capture/desktop_capture_device.cc
index 2a177112b1bd6b2be9341ab38b721f8735adce0d..f3b2218347f47f206f1900848a4505de8e43cf80 100644
--- a/content/browser/media/capture/desktop_capture_device.cc
+++ b/content/browser/media/capture/desktop_capture_device.cc
@@ -380,9 +380,9 @@ std::unique_ptr<media::VideoCaptureDevice> DesktopCaptureDevice::Create(
switch (source.type) {
case DesktopMediaID::TYPE_SCREEN: {
- std::unique_ptr<webrtc::ScreenCapturer> screen_capturer(
- webrtc::ScreenCapturer::Create(options));
- if (screen_capturer && screen_capturer->SelectScreen(source.id)) {
+ std::unique_ptr<webrtc::DesktopCapturer> screen_capturer(
+ webrtc::DesktopCapturer::CreateScreenCapturer(options));
+ if (screen_capturer && screen_capturer->SelectSource(source.id)) {
capturer.reset(new webrtc::DesktopAndCursorComposer(
screen_capturer.release(),
webrtc::MouseCursorMonitor::CreateForScreen(options, source.id)));
@@ -395,10 +395,10 @@ std::unique_ptr<media::VideoCaptureDevice> DesktopCaptureDevice::Create(
}
case DesktopMediaID::TYPE_WINDOW: {
- std::unique_ptr<webrtc::WindowCapturer> window_capturer(
+ std::unique_ptr<webrtc::DesktopCapturer> window_capturer(
webrtc::CroppingWindowCapturer::Create(options));
- if (window_capturer && window_capturer->SelectWindow(source.id)) {
- window_capturer->BringSelectedWindowToFront();
+ if (window_capturer && window_capturer->SelectSource(source.id)) {
+ window_capturer->FocusOnSelectedSource();
capturer.reset(new webrtc::DesktopAndCursorComposer(
window_capturer.release(),
webrtc::MouseCursorMonitor::CreateForWindow(options, source.id)));

Powered by Google App Engine
This is Rietveld 408576698