Notify WindowStateObserver when minimizing in maximized mode.

ash/common/wm/maximize_mode/maximize_mode_window_state.cc

 // Copyright 2014 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/common/wm/maximize_mode/maximize_mode_window_state.h"
 
 #include <utility>
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
@@ skipping 236 matching lines @@
 void MaximizeModeWindowState::UpdateWindow(wm::WindowState* window_state,
                                            wm::WindowStateType target_state,
                                            bool animated) {
   DCHECK(target_state == wm::WINDOW_STATE_TYPE_MINIMIZED ||
          target_state == wm::WINDOW_STATE_TYPE_MAXIMIZED ||
          target_state == wm::WINDOW_STATE_TYPE_PINNED ||
          (target_state == wm::WINDOW_STATE_TYPE_NORMAL &&
           !window_state->CanMaximize()) ||
          target_state == wm::WINDOW_STATE_TYPE_FULLSCREEN);
 
-  if (target_state == wm::WINDOW_STATE_TYPE_MINIMIZED) {
-    if (current_state_type_ == wm::WINDOW_STATE_TYPE_MINIMIZED)
+  if (current_state_type_ == target_state) {
+    if (target_state == wm::WINDOW_STATE_TYPE_MINIMIZED)
       return;
-
-    current_state_type_ = target_state;
-    window_state->window()->SetVisibilityAnimationType(
-        wm::WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE);
-    window_state->window()->Hide();
-    if (window_state->IsActive())
-      window_state->Deactivate();
-    return;
-  }
-
-  if (current_state_type_ == target_state) {
     // If the state type did not change, update it accordingly.
     UpdateBounds(window_state, animated);
     return;
   }
 
   const wm::WindowStateType old_state_type = current_state_type_;
   current_state_type_ = target_state;
   window_state->UpdateWindowShowStateFromStateType();
   window_state->NotifyPreStateTypeChange(old_state_type);
-  UpdateBounds(window_state, animated);
+
+  if (target_state == wm::WINDOW_STATE_TYPE_MINIMIZED) {
+    window_state->window()->SetVisibilityAnimationType(
+        wm::WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE);
+    window_state->window()->Hide();
+    if (window_state->IsActive())
+      window_state->Deactivate();
+  } else {
+    UpdateBounds(window_state, animated);
+  }
+
   window_state->NotifyPostStateTypeChange(old_state_type);
 
   if (old_state_type == wm::WINDOW_STATE_TYPE_PINNED ||
       target_state == wm::WINDOW_STATE_TYPE_PINNED) {
     WmShell::Get()->SetPinnedWindow(window_state->window());
   }
 
   if ((window_state->window()->GetTargetVisibility() ||
        old_state_type == wm::WINDOW_STATE_TYPE_MINIMIZED) &&
       !window_state->window()->GetLayer()->visible()) {
@@ skipping 26 matching lines @@
       // avoid flashing.
       if (window_state->IsMaximized())
         window_state->SetBoundsDirectCrossFade(bounds_in_parent);
       else
         window_state->SetBoundsDirectAnimated(bounds_in_parent);
     }
   }
 }
 
 }  // namespace ash