From 85fdacbc49e02ae56ee7beafc7027ee1041257d3 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Sat, 27 Oct 2018 14:49:13 +1100 Subject: [PATCH] chore: replace ShowWithWindowState with Show inside native_window_views The functionality was merged in as a parameter to the core Show method, default for restore_bounds is an empty gfx::Rect() refs: https://chromium-review.googlesource.com/c/chromium/src/+/1174910 --- atom/browser/native_window_views.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc index c45dbb26cc..bc1ab2f2ad 100644 --- a/atom/browser/native_window_views.cc +++ b/atom/browser/native_window_views.cc @@ -347,7 +347,7 @@ void NativeWindowViews::Show() { !widget()->native_widget_private()->IsVisible()) static_cast(parent())->IncrementChildModals(); - widget()->native_widget_private()->ShowWithWindowState(GetRestoredState()); + widget()->native_widget_private()->Show(GetRestoredState(), gfx::Rect()); NotifyWindowShow(); @@ -454,8 +454,8 @@ void NativeWindowViews::Maximize() { if (IsVisible()) widget()->Maximize(); else - widget()->native_widget_private()->ShowWithWindowState( - ui::SHOW_STATE_MAXIMIZED); + widget()->native_widget_private()->Show(ui::SHOW_STATE_MAXIMIZED, + gfx::Rect()); } void NativeWindowViews::Unmaximize() { @@ -477,8 +477,8 @@ void NativeWindowViews::Minimize() { if (IsVisible()) widget()->Minimize(); else - widget()->native_widget_private()->ShowWithWindowState( - ui::SHOW_STATE_MINIMIZED); + widget()->native_widget_private()->Show(ui::SHOW_STATE_MINIMIZED, + gfx::Rect()); } void NativeWindowViews::Restore() { @@ -533,8 +533,8 @@ void NativeWindowViews::SetFullScreen(bool fullscreen) { if (IsVisible()) widget()->SetFullscreen(fullscreen); else if (fullscreen) - widget()->native_widget_private()->ShowWithWindowState( - ui::SHOW_STATE_FULLSCREEN); + widget()->native_widget_private()->Show(ui::SHOW_STATE_FULLSCREEN, + gfx::Rect()); // Auto-hide menubar when in fullscreen. if (fullscreen)