Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(390)

Unified Diff: ui/views/widget/widget.cc

Issue 1130033003: Make the minimize state work when creating a chrome window in CrOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove the parentheses in the inline if statement Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/widget/native_widget_aura_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/widget.cc
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index 5ee2b5f8eb8759c03366e435f7ab45829ef0bfbc..8bffc6df584c6a1f81857d8a82e1d4b4d6e20c04 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_;
+ 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
« no previous file with comments | « ui/views/widget/native_widget_aura_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698