ash: Restore previous show state after exiting fullscreen.

ash/common/wm/default_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/default_state.h"
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/wm/dock/docked_window_layout_manager.h"
 #include "ash/common/wm/window_animation_types.h"
 #include "ash/common/wm/window_parenting_utils.h"
@@ skipping 749 matching lines @@
       window_state->SetBoundsDirectCrossFade(bounds_in_parent);
     } else if (window_state->is_dragged()) {
       // SetBoundsDirectAnimated does not work when the window gets reparented.
       // TODO(oshima): Consider fixing it and reenable the animation.
       window_state->SetBoundsDirect(bounds_in_parent);
     } else {
       window_state->SetBoundsDirectAnimated(bounds_in_parent);
     }
   }
 
+  if (window_state->IsFullscreen()) {
+    // Save the previous show state so that we can correctly restore it after
+    // exiting the fullscreen mode.
+    auto previous_ui_state_type = ToWindowShowState(previous_state_type);
+    if (previous_ui_state_type == ui::SHOW_STATE_MINIMIZED) {
+      // If the previous show state is ui::SHOW_STATE_MINIMIZED, we will use
+      // the show state before the window was minimized. But if the window
+      // was fullscreen before it was minimized, we will keep the
+      // PreFullscreenShowStat unchanged.
+      previous_ui_state_type = window->GetPreMinimizedShowState();
+      if (previous_ui_state_type != ui::SHOW_STATE_FULLSCREEN)
+        window->SetPreFullscreenShowState(previous_ui_state_type);
+    } else {
+      window->SetPreFullscreenShowState(previous_ui_state_type);
+    }
+  }
+
   if (window_state->IsMinimized()) {
-    // Save the previous show state so that we can correctly restore it.
-    window->SetRestoreShowState(ToWindowShowState(previous_state_type));
+    // Save the previous show state so that we can correctly restore it after
+    // exiting the minimized mode.
+    window->SetPreMinimizedShowState(ToWindowShowState(previous_state_type));
     window->SetVisibilityAnimationType(
         WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE);
 
     // Hide the window.
     window->Hide();
     // Activate another window.
     if (window_state->IsActive())
       window_state->Deactivate();
   } else if ((window->GetTargetVisibility() ||
               IsMinimizedWindowState(previous_state_type)) &&
@@ skipping 25 matching lines @@
     gfx::Rect center_in_parent = GetDisplayWorkAreaBoundsInParent(window);
     center_in_parent.ClampToCenteredSize(window->GetBounds().size());
     window_state->SetBoundsDirectAnimated(center_in_parent);
   }
   // Centering window is treated as if a user moved and resized the window.
   window_state->set_bounds_changed_by_user(true);
 }
 
 }  // namespace wm
 }  // namespace ash