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

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: fix test failures Created 5 years, 2 months 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
Index: ui/views/widget/widget.cc
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index e1fc508d798f0d5ca94f7ee9050a231c2c09ccb9..7c9d4cf49b7d7adc40dd451152bcf5bf302ba945 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -627,8 +627,12 @@ void Widget::Show() {
!IsFullscreen()) {
native_widget_->ShowMaximizedWithBounds(initial_restored_bounds_);
} else {
- native_widget_->ShowWithWindowState(
- IsFullscreen() ? ui::SHOW_STATE_FULLSCREEN : saved_show_state_);
+ if (IsFullscreen()) {
+ native_widget_->ShowWithWindowState(ui::SHOW_STATE_FULLSCREEN);
+ } else {
+ native_widget_->ShowWithWindowState(
+ IsMinimized() ? ui::SHOW_STATE_MINIMIZED : saved_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
« ui/views/widget/native_widget_aura.cc ('K') | « 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