mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: DesktopMediaList::Type replaces content::DesktopMediaType_*

Browse source 
Refs: 2700637
This commit is contained in:
Samuel Attard 2021-03-05 16:46:44 -08:00
parent 77ad17b383
commit 4e02d9407a
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
shell/browser/api/electron_api_desktop_capturer.cc
View file

@ -96,7 +96,7 @@ void DesktopCapturer::StartHandling(bool capture_window,
// Apply the new thumbnail size and restart capture. // Apply the new thumbnail size and restart capture.
if (capture_window) { if (capture_window) {
window_capturer_ = std::make_unique<NativeDesktopMediaList>( window_capturer_ = std::make_unique<NativeDesktopMediaList>(
content::DesktopMediaID::TYPE_WINDOW, DesktopMediaList::Type::kWindow,
content::desktop_capture::CreateWindowCapturer()); content::desktop_capture::CreateWindowCapturer());
window_capturer_->SetThumbnailSize(thumbnail_size); window_capturer_->SetThumbnailSize(thumbnail_size);
window_capturer_->AddObserver(this); window_capturer_->AddObserver(this);
@ -107,7 +107,7 @@ void DesktopCapturer::StartHandling(bool capture_window,
if (capture_screen) { if (capture_screen) {
screen_capturer_ = std::make_unique<NativeDesktopMediaList>( screen_capturer_ = std::make_unique<NativeDesktopMediaList>(
content::DesktopMediaID::TYPE_SCREEN, DesktopMediaList::Type::kScreen,
content::desktop_capture::CreateScreenCapturer()); content::desktop_capture::CreateScreenCapturer());
screen_capturer_->SetThumbnailSize(thumbnail_size); screen_capturer_->SetThumbnailSize(thumbnail_size);
screen_capturer_->AddObserver(this); screen_capturer_->AddObserver(this);
@ -124,7 +124,7 @@ void DesktopCapturer::OnSourceUnchanged(DesktopMediaList* list) {
void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) { void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
if (capture_window_ && if (capture_window_ &&
list->GetMediaListType() == content::DesktopMediaID::TYPE_WINDOW) { list->GetMediaListType() == DesktopMediaList::Type::kWindow) {
capture_window_ = false; capture_window_ = false;
const auto& media_list_sources = list->GetSources(); const auto& media_list_sources = list->GetSources();
std::vector<DesktopCapturer::Source> window_sources; std::vector<DesktopCapturer::Source> window_sources;
@ -138,7 +138,7 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
} }
if (capture_screen_ && if (capture_screen_ &&
list->GetMediaListType() == content::DesktopMediaID::TYPE_SCREEN) { list->GetMediaListType() == DesktopMediaList::Type::kScreen) {
capture_screen_ = false; capture_screen_ = false;
const auto& media_list_sources = list->GetSources(); const auto& media_list_sources = list->GetSources();
std::vector<DesktopCapturer::Source> screen_sources; std::vector<DesktopCapturer::Source> screen_sources;