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

10
shell/browser/native_window_views.cc
View file

@ -31,6 +31,7 @@
#include "shell/browser/ui/views/root_view.h"
#include "shell/browser/web_contents_preferences.h"
#include "shell/browser/web_view_manager.h"
#include "shell/browser/window_list.h"
#include "shell/common/electron_constants.h"
#include "shell/common/gin_converters/image_converter.h"
#include "shell/common/gin_helper/arguments.h"
@ -532,11 +533,16 @@ void NativeWindowViews::SetContentView(views::View* view) {
root_view_.GetMainView()->DeprecatedLayoutImmediately();
}
void NativeWindowViews::CloseImpl() {
void NativeWindowViews::Close() {
if (!IsClosable()) {
WindowList::WindowCloseCancelled(this);
return;
}
widget()->Close();
}
void NativeWindowViews::CloseImmediatelyImpl() {
void NativeWindowViews::CloseImmediately() {
widget()->CloseNow();
}