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

refactor: use upstream content protection logic on macOS (#46814)

Browse source 
* refactor: use upstream content protection logic on macOS

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

* Update shell/browser/native_window.h

Co-authored-by: Charles Kerr <charles@charleskerr.com>

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
trop[bot] 2025-04-26 19:40:39 -05:00 • committed by GitHub
parent 6433847b09
commit 40624199eb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 17 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

15
shell/browser/native_window.cc
View file

@ -26,6 +26,7 @@
#include "shell/common/options_switches.h"
#include "ui/base/hit_test.h"
#include "ui/compositor/compositor.h"
#include "ui/views/widget/native_widget_private.h"
#include "ui/views/widget/widget.h"
#if !BUILDFLAG(IS_MAC)
@ -814,6 +815,20 @@ void NativeWindow::HandlePendingFullscreenTransitions() {
SetFullScreen(next_transition);
}
void NativeWindow::SetContentProtection(bool enable) {
#if !BUILDFLAG(IS_LINUX)
widget()->native_widget_private()->SetAllowScreenshots(!enable);
#endif
}
bool NativeWindow::IsContentProtected() const {
#if !BUILDFLAG(IS_LINUX)
return !widget()->native_widget_private()->AreScreenshotsAllowed();
#else // Not implemented on Linux
return false;
#endif
}
bool NativeWindow::IsTranslucent() const {
// Transparent windows are translucent
if (transparent()) {

4
shell/browser/native_window.h
View file

@ -186,8 +186,8 @@ class NativeWindow : public base::SupportsUserData,
virtual void SetDocumentEdited(bool edited) {}
virtual bool IsDocumentEdited() const;
virtual void SetIgnoreMouseEvents(bool ignore, bool forward) = 0;
virtual void SetContentProtection(bool enable) = 0;
virtual bool IsContentProtected() const = 0;
void SetContentProtection(bool enable);
bool IsContentProtected() const;
virtual void SetFocusable(bool focusable) {}
virtual bool IsFocusable() const;
virtual void SetMenu(ElectronMenuModel* menu) {}

2
shell/browser/native_window_mac.h
View file

@ -109,8 +109,6 @@ class NativeWindowMac : public NativeWindow,
void SetIgnoreMouseEvents(bool ignore, bool forward) override;
bool IsHiddenInMissionControl() const override;
void SetHiddenInMissionControl(bool hidden) override;
void SetContentProtection(bool enable) override;
bool IsContentProtected() const override;
void SetFocusable(bool focusable) override;
bool IsFocusable() const override;
void SetParentWindow(NativeWindow* parent) override;

9
shell/browser/native_window_mac.mm
View file

@ -1171,15 +1171,6 @@ void NativeWindowMac::SetIgnoreMouseEvents(bool ignore, bool forward) {
}
}
void NativeWindowMac::SetContentProtection(bool enable) {
[window_
setSharingType:enable ? NSWindowSharingNone : NSWindowSharingReadOnly];
}
bool NativeWindowMac::IsContentProtected() const {
return [window_ sharingType] == NSWindowSharingNone;
}
void NativeWindowMac::SetFocusable(bool focusable) {
// No known way to unfocus the window if it had the focus. Here we do not
// want to call Focus(false) because it moves the window to the back, i.e.

15
shell/browser/native_window_views.cc
View file

@ -44,7 +44,6 @@
#include "ui/ozone/public/ozone_platform.h"
#include "ui/views/background.h"
#include "ui/views/controls/webview/webview.h"
#include "ui/views/widget/native_widget_private.h"
#include "ui/views/widget/widget.h"
#include "ui/views/window/client_view.h"
#include "ui/wm/core/shadow_types.h"
@ -1312,20 +1311,6 @@ void NativeWindowViews::SetIgnoreMouseEvents(bool ignore, bool forward) {
#endif
}
void NativeWindowViews::SetContentProtection(bool enable) {
#if BUILDFLAG(IS_WIN)
widget()->native_widget_private()->SetAllowScreenshots(!enable);
#endif
}
bool NativeWindowViews::IsContentProtected() const {
#if BUILDFLAG(IS_WIN)
return !widget()->native_widget_private()->AreScreenshotsAllowed();
#else // Not implemented on Linux
return false;
#endif
}
void NativeWindowViews::SetFocusable(bool focusable) {
widget()->widget_delegate()->SetCanActivate(focusable);
#if BUILDFLAG(IS_WIN)

2
shell/browser/native_window_views.h
View file

@ -115,8 +115,6 @@ class NativeWindowViews : public NativeWindow,
void SetOpacity(const double opacity) override;
double GetOpacity() const override;
void SetIgnoreMouseEvents(bool ignore, bool forward) override;
void SetContentProtection(bool enable) override;
bool IsContentProtected() const override;
void SetFocusable(bool focusable) override;
bool IsFocusable() const override;
void SetMenu(ElectronMenuModel* menu_model) override;