2aa2611f76
* tmp Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> * feat: add support for system picker in setDisplayMediaRequestHandler Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> * oops Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> * Apply suggestions from code review Co-authored-by: Erick Zhao <erick@hotmail.ca> Co-authored-by: Samuel Attard <sam@electronjs.org> * stuff Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> * well... Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> * seems legit Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> * chore: update patch to handle screenCapturer Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * feat: modify API to use useSystemPicker Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * fix: gate ScreenCaptureKitPicker to macos 15 or higher Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * fix: don't use native picker with legacy media selection Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * chore: code review, boolean set & docs update Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * fix: add cancelCallback Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * docs: clarify session & desktopCapturer docs Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * chore: update patches --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> Co-authored-by: Samuel Attard <sam@electronjs.org> Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
43 lines
1.4 KiB
Text
43 lines
1.4 KiB
Text
// Copyright (c) 2024 Salesforce, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "electron/shell/browser/feature_list.h"
|
|
|
|
#include <string>
|
|
|
|
#include "base/dcheck_is_on.h"
|
|
|
|
namespace electron {
|
|
|
|
std::string EnablePlatformSpecificFeatures() {
|
|
if (@available(macOS 14.4, *)) {
|
|
// These flags aren't exported so reference them by name directly, they are
|
|
// used to ensure that screen and window capture exclusive use
|
|
// ScreenCaptureKit APIs to avoid warning dialogs on macOS 14.4 and higher.
|
|
// kScreenCaptureKitPickerScreen,
|
|
// chrome/browser/media/webrtc/thumbnail_capturer_mac.mm
|
|
// kScreenCaptureKitStreamPickerSonoma,
|
|
// chrome/browser/media/webrtc/thumbnail_capturer_mac.mm
|
|
// kThumbnailCapturerMac,
|
|
// chrome/browser/media/webrtc/thumbnail_capturer_mac.mm
|
|
#if DCHECK_IS_ON()
|
|
return "ScreenCaptureKitPickerScreen,ScreenCaptureKitStreamPickerSonoma";
|
|
#else
|
|
return "ScreenCaptureKitPickerScreen,ScreenCaptureKitStreamPickerSonoma,"
|
|
"ThumbnailCapturerMac:capture_mode/sc_screenshot_manager";
|
|
#endif
|
|
}
|
|
return "";
|
|
}
|
|
|
|
std::string DisablePlatformSpecificFeatures() {
|
|
if (@available(macOS 14.4, *)) {
|
|
// Required to stop timing out getDisplayMedia while waiting for
|
|
// the user to select a window with the picker
|
|
return "TimeoutHangingVideoCaptureStarts";
|
|
}
|
|
return "";
|
|
}
|
|
|
|
} // namespace electron
|