Skip to content

Commit

Permalink
fixup Disable kDesktopCaptureMacV2
Browse files Browse the repository at this point in the history
  • Loading branch information
jkleinsc committed Aug 18, 2021
1 parent 28dc56a commit 7b634de
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion shell/browser/native_window_mac.mm
Expand Up @@ -257,9 +257,10 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {

// Refs https://github.com/electron/electron/pull/30507
// TODO(deepak1556): Enable this flag to match upstream
#if 0
const base::Feature kWindowCaptureMacV2{"WindowCaptureMacV2",
base::FEATURE_DISABLED_BY_DEFAULT};

#endif
} // namespace

NativeWindowMac::NativeWindowMac(const gin_helper::Dictionary& options,
Expand Down Expand Up @@ -1260,11 +1261,15 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
content::DesktopMediaID::TYPE_WINDOW, GetAcceleratedWidget());
// c.f.
// https://source.chromium.org/chromium/chromium/src/+/master:chrome/browser/media/webrtc/native_desktop_media_list.cc;l=372?q=kWindowCaptureMacV2&ss=chromium
// Refs https://github.com/electron/electron/pull/30507
// TODO(deepak1556): Enable this flag to match upstream WindowCaptureMacV2"
#if 0
if (base::FeatureList::IsEnabled(kWindowCaptureMacV2)) {
if (remote_cocoa::ScopedCGWindowID::Get(desktop_media_id.id)) {
desktop_media_id.window_id = desktop_media_id.id;
}
}
#endif
return desktop_media_id;
}

Expand Down

0 comments on commit 7b634de

Please sign in to comment.