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

fix: revert moving IsClosed() and IsClosable() into NativeWindow::Close() (#47482)

Browse source 
Revert "refactor: move `IsClosed()` and `IsClosable()` tests into `NativeWindow::Close()` (#46888)"

This reverts commit 3faddd5ae2.
This commit is contained in:
Keeley Hammond 2025-06-16 16:41:19 -07:00 • committed by GitHub
commit 3536d4976a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

12
shell/browser/native_window_mac.mm
View file

@ -33,6 +33,7 @@
#include "shell/browser/ui/cocoa/root_view_mac.h"
#include "shell/browser/ui/cocoa/window_buttons_proxy.h"
#include "shell/browser/ui/drag_util.h"
#include "shell/browser/window_list.h"
#include "shell/common/gin_converters/gfx_converter.h"
#include "shell/common/gin_helper/dictionary.h"
#include "shell/common/node_util.h"
@ -336,7 +337,12 @@ void NativeWindowMac::SetContentView(views::View* view) {
root_view->DeprecatedLayoutImmediately();
}
void NativeWindowMac::CloseImpl() {
void NativeWindowMac::Close() {
if (!IsClosable()) {
WindowList::WindowCloseCancelled(this);
return;
}
if (is_transitioning_fullscreen()) {
SetHasDeferredWindowClose(true);
return;
@ -372,7 +378,7 @@ void NativeWindowMac::CloseImpl() {
}
}
void NativeWindowMac::CloseImmediatelyImpl() {
void NativeWindowMac::CloseImmediately() {
// Ensure we're detached from the parent window before closing.
RemoveChildFromParentWindow();
@ -1686,7 +1692,7 @@ bool NativeWindowMac::IsActive() const {
}
void NativeWindowMac::Cleanup() {
DCHECK(!is_closed());
DCHECK(!IsClosed());
ui::NativeTheme::GetInstanceForNativeUi()->RemoveObserver(this);
display::Screen::GetScreen()->RemoveObserver(this);
[window_ cleanup];