Index: webrtc/modules/desktop_capture/win/screen_capture_utils.cc |
diff --git a/webrtc/modules/desktop_capture/win/screen_capture_utils.cc b/webrtc/modules/desktop_capture/win/screen_capture_utils.cc |
index 1b3354527795f79fc1ae5cf61f1de0382d9e383f..7d9203f27b6915e72a5415c27f79988e67e10ae8 100644 |
--- a/webrtc/modules/desktop_capture/win/screen_capture_utils.cc |
+++ b/webrtc/modules/desktop_capture/win/screen_capture_utils.cc |
@@ -10,13 +10,14 @@ |
#include "webrtc/modules/desktop_capture/win/screen_capture_utils.h" |
-#include <assert.h> |
#include <windows.h> |
+#include "webrtc/base/checks.h" |
+ |
namespace webrtc { |
-bool GetScreenList(ScreenCapturer::ScreenList* screens) { |
- assert(screens->size() == 0); |
+bool GetScreenList(DesktopCapturer::SourceList* screens) { |
+ RTC_DCHECK(screens->size() == 0); |
BOOL enum_result = TRUE; |
for (int device_index = 0;; ++device_index) { |
@@ -32,14 +33,12 @@ bool GetScreenList(ScreenCapturer::ScreenList* screens) { |
if (!(device.StateFlags & DISPLAY_DEVICE_ACTIVE)) |
continue; |
- ScreenCapturer::Screen screen; |
- screen.id = device_index; |
- screens->push_back(screen); |
+ screens->push_back({device_index, std::string()}); |
} |
return true; |
} |
-bool IsScreenValid(ScreenId screen, std::wstring* device_key) { |
+bool IsScreenValid(DesktopCapturer::SourceId screen, std::wstring* device_key) { |
if (screen == kFullDesktopScreenId) { |
*device_key = L""; |
return true; |
@@ -54,7 +53,8 @@ bool IsScreenValid(ScreenId screen, std::wstring* device_key) { |
return !!enum_result; |
} |
-DesktopRect GetScreenRect(ScreenId screen, const std::wstring& device_key) { |
+DesktopRect GetScreenRect(DesktopCapturer::SourceId screen, |
+ const std::wstring& device_key) { |
if (screen == kFullDesktopScreenId) { |
return DesktopRect::MakeXYWH(GetSystemMetrics(SM_XVIRTUALSCREEN), |
GetSystemMetrics(SM_YVIRTUALSCREEN), |