Chromium Code Reviews| Index: ui/views/widget/widget.cc |
| diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc |
| index 5ee2b5f8eb8759c03366e435f7ab45829ef0bfbc..c74228b267454ba24d1147b56e35bce406c435f7 100644 |
| --- a/ui/views/widget/widget.cc |
| +++ b/ui/views/widget/widget.cc |
| @@ -636,8 +636,10 @@ void Widget::Show() { |
| !IsFullscreen()) { |
| native_widget_->ShowMaximizedWithBounds(initial_restored_bounds_); |
| } else { |
| - native_widget_->ShowWithWindowState( |
| - IsFullscreen() ? ui::SHOW_STATE_FULLSCREEN : saved_show_state_); |
| + ui::WindowShowState show_state = |
| + IsFullscreen() ? ui::SHOW_STATE_FULLSCREEN : |
| + (IsMinimized() ? ui::SHOW_STATE_MINIMIZED : saved_show_state_); |
|
sadrul
2015/11/25 20:44:32
Don't need ()
joone
2015/11/26 15:50:38
Done.
|
| + native_widget_->ShowWithWindowState(show_state); |
| } |
| // |saved_show_state_| only applies the first time the window is shown. |
| // If we don't reset the value the window may be shown maximized every time |