ash: Fix gray tab contents when restoring a minimized window.

Minimized windows have their own special animation for restoring.  We need to play this animation even when the "restore" is to a maximized state.  The cross-fade-to-bounds animation we use when restoring maximized windows should not play in this case.

BUG=131710
TEST=Open window and maximize it, right-click launcher and ensure "Autohide when maximized" is unchecked, minimize window by clicking in launcher, maximize the window by clicking in launcher, verified tab contents still visible

Review URL: https://chromiumcodereview.appspot.com/10542157

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142150 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 2 deletions

diff --git a/ash/wm/base_layout_manager.cc b/ash/wm/base_layout_manager.cc
index f2de193..d9f90a6 100644
--- a/ash/wm/base_layout_manager.cc
+++ b/ash/wm/base_layout_manager.cc
@@ -131,8 +131,11 @@ void BaseLayoutManager::OnWindowPropertyChanged(aura::Window* window,
                                                 const void* key,
                                                 intptr_t old) {
   if (key == aura::client::kShowStateKey) {
-    UpdateBoundsFromShowState(window, true);
-    ShowStateChanged(window, static_cast<ui::WindowShowState>(old));
+    ui::WindowShowState old_state = static_cast<ui::WindowShowState>(old);
+    // Minimized state handles its own animations.
+    bool animate = (old_state != ui::SHOW_STATE_MINIMIZED);
+    UpdateBoundsFromShowState(window, animate);
+    ShowStateChanged(window, old_state);
   }
 }