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

chore: bump chromium to 93.0.4550.0 (main) (#29751)

Browse source
This commit is contained in:
electron-roller[bot] 2021-06-22 12:17:16 -07:00 • committed by GitHub
parent c5066cce22
commit b8261f1591
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
78 changed files with 402 additions and 429 deletions
Download patch file Download diff file Expand all files Collapse all files

27
shell/browser/native_window_views.cc
View file

@ -345,6 +345,21 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options,
// bounds if the bounds are smaller than the current display
SetBounds(gfx::Rect(GetPosition(), bounds.size()), false);
#endif
SetOwnedByWidget(false);
RegisterDeleteDelegateCallback(base::BindOnce(
[](NativeWindowViews* window) {
if (window->is_modal() && window->parent()) {
auto* parent = window->parent();
// Enable parent window after current window gets closed.
static_cast<NativeWindowViews*>(parent)->DecrementChildModals();
// Focus on parent window.
parent->Focus(true);
}
window->NotifyWindowClosed();
},
this));
}
NativeWindowViews::~NativeWindowViews() {
@ -1472,18 +1487,6 @@ void NativeWindowViews::OnWidgetDestroyed(views::Widget* changed_widget) {
widget_destroyed_ = true;
}
void NativeWindowViews::DeleteDelegate() {
if (is_modal() && this->parent()) {
auto* parent = this->parent();
// Enable parent window after current window gets closed.
static_cast<NativeWindowViews*>(parent)->DecrementChildModals();
// Focus on parent window.
parent->Focus(true);
}
NotifyWindowClosed();
}
views::View* NativeWindowViews::GetInitiallyFocusedView() {
return focused_view_;
}