Unify window fullscreen and minimizing implementation

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 592 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::SetPreMinimizedShowState(ui::WindowShowState show_state) {
+  DCHECK_NE(show_state, ui::SHOW_STATE_PREVIOUS);
   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);
+  DCHECK_NE(show_state, ui::SHOW_STATE_PREVIOUS);
   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;
   }
@@ skipping 131 matching lines @@
   wm::DeactivateWindow(window_);
 }
 
 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);
+    DCHECK_NE(state, ui::SHOW_STATE_PREVIOUS);
     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() {
@@ skipping 150 matching lines @@
 
 void WmWindow::OnWindowStackingChanged(aura::Window* window) {
   for (auto& observer : observers_)
     observer.OnWindowStackingChanged(this);
 }
 
 void WmWindow::OnWindowPropertyChanged(aura::Window* window,
                                        const void* key,
                                        intptr_t old) {
   if (key == aura::client::kShowStateKey) {
-    ash::wm::GetWindowState(window_)->OnWindowShowStateChanged();
+    ui::WindowShowState state = GetShowState();
+    if (state == ui::SHOW_STATE_PREVIOUS) {
+      ui::WindowShowState old_state = static_cast<ui::WindowShowState>(old);
+      if (old_state == ui::SHOW_STATE_FULLSCREEN) {
+        SetFullscreen(false);
+      } else if (old_state == ui::SHOW_STATE_MINIMIZED) {
+        Unminimize();
+      } else {
+        NOTREACHED();
+      }
+    } else {
+      ash::wm::GetWindowState(window_)->OnWindowShowStateChanged();
+    }
     return;
   }
   WmWindowProperty wm_property;
   if (key == aura::client::kAlwaysOnTopKey) {
     wm_property = WmWindowProperty::ALWAYS_ON_TOP;
   } else if (key == aura::client::kAppIconKey) {
     wm_property = WmWindowProperty::APP_ICON;
   } else if (key == aura::client::kDrawAttentionKey) {
     wm_property = WmWindowProperty::DRAW_ATTENTION;
   } else if (key == aura::client::kModalKey) {
@@ skipping 56 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