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

chore: bump chromium to 79eae5b7b2d9dac441ac0182ee160 (master) (#19166)

Browse source
This commit is contained in:
Electron Bot 2019-07-24 15:58:51 -07:00 • committed by Jeremy Apthorp
parent 6d83eaaf4b
commit bd526f97a5
92 changed files with 507 additions and 461 deletions
Download patch file Download diff file Expand all files Collapse all files

12
shell/browser/native_window_views.cc
View file

@ -752,19 +752,19 @@ bool NativeWindowViews::IsClosable() {
#endif
}
void NativeWindowViews::SetAlwaysOnTop(bool top,
void NativeWindowViews::SetAlwaysOnTop(ui::ZOrderLevel z_order,
const std::string& level,
int relativeLevel,
std::string* error) {
if (top != widget()->IsAlwaysOnTop())
if (z_order != widget()->GetZOrderLevel())
NativeWindow::NotifyWindowAlwaysOnTopChanged();
widget()->SetAlwaysOnTop(top);
widget()->SetZOrderLevel(z_order);
#if defined(OS_WIN)
// Reset the placement flag.
behind_task_bar_ = false;
if (top) {
if (z_order != ui::ZOrderLevel::kNormal) {
// On macOS the window is placed behind the Dock for the following levels.
// Re-use the same names on Windows to make it easier for the user.
static const std::vector<std::string> levels = {
@ -775,8 +775,8 @@ void NativeWindowViews::SetAlwaysOnTop(bool top,
MoveBehindTaskBarIfNeeded();
}
bool NativeWindowViews::IsAlwaysOnTop() {
return widget()->IsAlwaysOnTop();
ui::ZOrderLevel NativeWindowViews::GetZOrderLevel() {
return widget()->GetZOrderLevel();
}
void NativeWindowViews::Center() {