Unminimize the minimized state, instead of showing

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/screen_ash.h"
 #include "ash/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
@@ skipping 113 matching lines @@
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // BaseLayoutManager, aura::client::ActivationChangeObserver implementation:
 
 void BaseLayoutManager::OnWindowActivated(aura::Window* gained_active,
                                           aura::Window* lost_active) {
   wm::WindowState* window_state = wm::GetWindowState(gained_active);
   if (window_state && window_state->IsMinimized() &&
       !gained_active->IsVisible()) {
-    gained_active->Show();
+    window_state->Unminimize();
     DCHECK(!window_state->IsMinimized());
   }
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // BaseLayoutManager, ash::ShellObserver overrides:
 
 void BaseLayoutManager::OnDisplayWorkAreaInsetsChanged() {
   AdjustAllWindowsBoundsForWorkAreaChange(
       ADJUST_WINDOW_WORK_AREA_INSETS_CHANGED);
@@ skipping 20 matching lines @@
   ShowStateChanged(window_state, old_state);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // BaseLayoutManager, protected:
 
 void BaseLayoutManager::ShowStateChanged(
     wm::WindowState* window_state,
     ui::WindowShowState last_show_state) {
   if (window_state->IsMinimized()) {
+    if (last_show_state == ui::SHOW_STATE_MINIMIZED)
+      return;
+
     // Save the previous show state so that we can correctly restore it.
     window_state->window()->SetProperty(aura::client::kRestoreShowStateKey,
                                         last_show_state);
     views::corewm::SetWindowVisibilityAnimationType(
         window_state->window(), WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE);
 
     // Hide the window.
     window_state->window()->Hide();
     // Activate another window.
     if (window_state->IsActive())
@@ skipping 84 matching lines @@
                            ScreenAsh::GetDisplayBoundsInParent(window));
       break;
 
     default:
       break;
   }
 }
 
 }  // namespace internal
 }  // namespace ash