ash: Restore previous show state after exiting fullscreen.

ash/common/wm_window.cc

 // Copyright 2016 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_window.h"
 
 #include "ash/aura/aura_layout_manager_adapter.h"
 #include "ash/aura/wm_shell_aura.h"
 #include "ash/common/ash_constants.h"
 #include "ash/common/shelf/shelf_item_types.h"
@@ skipping 591 matching lines @@
 }
 
 void WmWindow::SetShowState(ui::WindowShowState show_state) {
   window_->SetProperty(aura::client::kShowStateKey, show_state);
 }
 
 ui::WindowShowState WmWindow::GetShowState() const {
   return window_->GetProperty(aura::client::kShowStateKey);
 }
 
-void WmWindow::SetRestoreShowState(ui::WindowShowState show_state) {
-  window_->SetProperty(aura::client::kRestoreShowStateKey, show_state);
+void WmWindow::SetPreMinimizedShowState(ui::WindowShowState show_state) {
+  window_->SetProperty(aura::client::kPreMinimizedShowStateKey, show_state);
+}
+
+ui::WindowShowState WmWindow::GetPreMinimizedShowState() const {
+  return window_->GetProperty(aura::client::kPreMinimizedShowStateKey);
+}
+
+void WmWindow::SetPreFullscreenShowState(ui::WindowShowState show_state) {
+  // We should never store the ui::SHOW_STATE_MINIMIZED as the show state before
+  // fullscreen.
+  DCHECK_NE(show_state, ui::SHOW_STATE_MINIMIZED);
+  window_->SetProperty(aura::client::kPreFullscreenShowStateKey, show_state);
 }
 
 void WmWindow::SetRestoreOverrides(const gfx::Rect& bounds_override,
                                    ui::WindowShowState window_state_override) {
   if (bounds_override.IsEmpty()) {
     window_->ClearProperty(kRestoreShowStateOverrideKey);
     window_->ClearProperty(kRestoreBoundsOverrideKey);
     return;
   }
   window_->SetProperty(kRestoreShowStateOverrideKey, window_state_override);
@@ skipping 123 matching lines @@
 }
 
 void WmWindow::Activate() {
   wm::ActivateWindow(window_);
 }
 
 void WmWindow::Deactivate() {
   wm::DeactivateWindow(window_);
 }
 
-void WmWindow::SetFullscreen() {
-  window_->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
+void WmWindow::SetFullscreen(bool fullscreen) {
+  if (fullscreen) {
+    window_->SetProperty(aura::client::kShowStateKey,
+                         ui::SHOW_STATE_FULLSCREEN);
+  } else {
+    auto state = window_->GetProperty(aura::client::kPreFullscreenShowStateKey);
+    DCHECK_NE(state, ui::SHOW_STATE_MINIMIZED);
+    window_->SetProperty(aura::client::kShowStateKey, state);
+    window_->ClearProperty(aura::client::kPreFullscreenShowStateKey);
+  }
 }
 
 void WmWindow::Maximize() {
   window_->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
 }
 
 void WmWindow::Minimize() {
   window_->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MINIMIZED);
 }
 
 void WmWindow::Unminimize() {
   window_->SetProperty(
       aura::client::kShowStateKey,
-      window_->GetProperty(aura::client::kRestoreShowStateKey));
-  window_->ClearProperty(aura::client::kRestoreShowStateKey);
+      window_->GetProperty(aura::client::kPreMinimizedShowStateKey));
+  window_->ClearProperty(aura::client::kPreMinimizedShowStateKey);
 }
 
 std::vector<WmWindow*> WmWindow::GetChildren() {
   return FromAuraWindows(window_->children());
 }
 
 WmWindow* WmWindow::GetChildByShellWindowId(int id) {
   return Get(window_->GetChildById(id));
 }
 
@@ skipping 209 matching lines @@
     observer.OnTransientChildAdded(this, Get(transient));
 }
 
 void WmWindow::OnTransientChildRemoved(aura::Window* window,
                                        aura::Window* transient) {
   for (auto& observer : transient_observers_)
     observer.OnTransientChildRemoved(this, Get(transient));
 }
 
 }  // namespace ash