Unify window fullscreen and minimizing implementation

ui/wm/core/window_util.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 "ui/wm/core/window_util.h"
 
 #include "base/memory/ptr_util.h"
+#include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_tree_owner.h"
 #include "ui/wm/core/transient_window_manager.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace {
 
 // Invokes RecreateLayer() on all the children of |to_clone|, adding the newly
 // cloned children to |parent|.
@@ skipping 59 matching lines @@
 
 bool CanActivateWindow(aura::Window* window) {
   DCHECK(window);
   if (!window->GetRootWindow())
     return false;
   aura::client::ActivationClient* client =
       aura::client::GetActivationClient(window->GetRootWindow());
   return client && client->CanActivateWindow(window);
 }
 
+void SetWindowFullscreen(aura::Window* window, bool fullscreen) {
+  DCHECK(window);
+  auto current_state = window->GetProperty(aura::client::kShowStateKey);

[sky, 2017/01/24 21:56:33]

It isn't obvious what the type is here, please use a type.
And name it current_show_state.

[Peng, 2017/01/24 22:13:03]

Done.

+  bool is_fullscreen = current_state == ui::SHOW_STATE_FULLSCREEN;
+  if (fullscreen == is_fullscreen)
+    return;
+  if (fullscreen) {
+    // Save the previous show state so that we can correctly restore it after
+    // exiting the fullscreen mode.
+    auto pre_state = current_state;

[sky, 2017/01/24 21:56:33]

pre_show_state.

[Peng, 2017/01/24 22:13:03]

Done.

+    // 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
+    // PreMinimizedShowState unchanged.
+    if (pre_state == ui::SHOW_STATE_MINIMIZED)
+      pre_state = window->GetProperty(aura::client::kPreMinimizedShowStateKey);
+    if (pre_state != ui::SHOW_STATE_FULLSCREEN)
+      window->SetProperty(aura::client::kPreFullscreenShowStateKey, pre_state);
+    window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
+  } else {
+    auto pre_fullscreen_state =

[sky, 2017/01/24 21:56:33]

pre_fullscreen_show_state. And same comment about auto.

[Peng, 2017/01/24 22:13:03]

Done.

+        window->GetProperty(aura::client::kPreFullscreenShowStateKey);
+    DCHECK_NE(pre_fullscreen_state, ui::SHOW_STATE_MINIMIZED);
+    window->SetProperty(aura::client::kShowStateKey, pre_fullscreen_state);
+    window->ClearProperty(aura::client::kPreFullscreenShowStateKey);
+  }
+}
+
 aura::Window* GetActivatableWindow(aura::Window* window) {
   aura::client::ActivationClient* client =
       aura::client::GetActivationClient(window->GetRootWindow());
   return client ? client->GetActivatableWindow(window) : NULL;
 }
 
 aura::Window* GetToplevelWindow(aura::Window* window) {
   aura::client::ActivationClient* client =
       aura::client::GetActivationClient(window->GetRootWindow());
   return client ? client->GetToplevelWindow(window) : NULL;
@@ skipping 44 matching lines @@
 bool HasTransientAncestor(const aura::Window* window,
                           const aura::Window* ancestor) {
   const aura::Window* transient_parent = GetTransientParent(window);
   if (transient_parent == ancestor)
     return true;
   return transient_parent ?
       HasTransientAncestor(transient_parent, ancestor) : false;
 }
 
 }  // namespace wm