Set the window state consistently

ui/views/widget/native_widget_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/widget/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 445 matching lines @@
         base::Bind(&NativeWidgetAura::CloseNow,
                    close_widget_factory_.GetWeakPtr()));
   }
 }
 
 void NativeWidgetAura::CloseNow() {
   delete window_;
 }
 
 void NativeWidgetAura::Show() {
-  ShowWithWindowState(ui::SHOW_STATE_NORMAL);
+  if (IsMaximized())
+    ShowWithWindowState(ui::SHOW_STATE_MAXIMIZED);
+  else if (IsFullscreen())
+    ShowWithWindowState(ui::SHOW_STATE_FULLSCREEN);
+  else if (IsMinimized())
+    ShowWithWindowState(ui::SHOW_STATE_MINIMIZED);
+  else
+    ShowWithWindowState(ui::SHOW_STATE_NORMAL);
 }
 
 void NativeWidgetAura::Hide() {
   if (window_)
     window_->Hide();
 }
 
 void NativeWidgetAura::ShowMaximizedWithBounds(
     const gfx::Rect& restored_bounds) {
   SetRestoreBounds(window_, restored_bounds);
   ShowWithWindowState(ui::SHOW_STATE_MAXIMIZED);
 }
 
 void NativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) {
   if (!window_)
     return;
+  if (state == ui::SHOW_STATE_DEFAULT)
+    state = ui::SHOW_STATE_NORMAL;
+  if (state != ui::SHOW_STATE_MINIMIZED)
+    window_->SetProperty(aura::client::kShowStateKey, state);
 
-  if (state == ui::SHOW_STATE_MAXIMIZED || state == ui::SHOW_STATE_FULLSCREEN ||
-      state == ui::SHOW_STATE_DOCKED) {
-    window_->SetProperty(aura::client::kShowStateKey, state);
-  }
   window_->Show();
   if (delegate_->CanActivate()) {
     if (state != ui::SHOW_STATE_INACTIVE)
       Activate();
     // SetInitialFocus() should be always be called, even for
     // SHOW_STATE_INACTIVE. If the window has to stay inactive, the method will
     // do the right thing.
     SetInitialFocus(state);
   }
 
@@ skipping 670 matching lines @@
   l10n_util::AdjustUIFont(&(ncm.lfCaptionFont));
   base::win::ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont)));
   return gfx::FontList(gfx::Font(caption_font));
 #else
   return gfx::FontList();
 #endif
 }
 
 }  // namespace internal
 }  // namespace views