ash: Window restore-bounds should not be reset when showing window from minimized state.

ash/wm/base_layout_manager.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 "ash/wm/base_layout_manager.h"
 
 #include "ash/ash_switches.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/wm/shelf_layout_manager.h"
@@ skipping 117 matching lines @@
 /////////////////////////////////////////////////////////////////////////////
 // BaseLayoutManager, WindowObserver overrides:
 
 void BaseLayoutManager::OnWindowPropertyChanged(aura::Window* window,
                                                 const void* key,
                                                 intptr_t old) {
   if (key == aura::client::kShowStateKey) {
     ui::WindowShowState old_state = static_cast<ui::WindowShowState>(old);
     ui::WindowShowState new_state =
         window->GetProperty(aura::client::kShowStateKey);
-    if (old_state != new_state &&
+    if (old_state != new_state && old_state != ui::SHOW_STATE_MINIMIZED &&
         ((new_state == ui::SHOW_STATE_MAXIMIZED &&
           old_state != ui::SHOW_STATE_FULLSCREEN) ||
          (new_state == ui::SHOW_STATE_FULLSCREEN &&
           old_state != ui::SHOW_STATE_MAXIMIZED))) {
       SetRestoreBoundsInParent(window, window->bounds());
     }
     // Minimized state handles its own animations.
     bool animate = (old_state != ui::SHOW_STATE_MINIMIZED);
     UpdateBoundsFromShowState(window, animate);
     ShowStateChanged(window, old_state);
@@ skipping 104 matching lines @@
       gfx::Rect display_rect =
           ScreenAsh::GetDisplayWorkAreaBoundsInParent(window);
       // Put as much of the window as possible within the display area.
       window->SetBounds(window->bounds().AdjustToFit(display_rect));
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash