Moves a couple of the maximize mode classes to ash/common

ash/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/wm/maximize_mode/maximize_mode_window_state.h"
 
 #include <utility>
 
-#include "ash/aura/wm_window_aura.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_animation_types.h"
-#include "ash/common/wm/window_state_delegate.h"
 #include "ash/common/wm/window_state_util.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm/wm_screen_util.h"
-#include "ash/common/wm/workspace/workspace_window_resizer.h"
 #include "ash/common/wm_shell.h"
-#include "ash/screen_util.h"
-#include "ash/shell.h"
+#include "ash/common/wm_window.h"
 #include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
-#include "ash/wm/window_animations.h"
-#include "ash/wm/window_properties.h"
-#include "ash/wm/window_state_aura.h"
-#include "ash/wm/window_util.h"
-#include "ui/aura/client/aura_constants.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_delegate.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/views/view_constants_aura.h"
-#include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace {
 
 // Returns the biggest possible size for a window which is about to be
 // maximized.
 gfx::Size GetMaximumSizeOfWindow(wm::WindowState* window_state) {
   DCHECK(window_state->CanMaximize() || window_state->CanResize());
 
   gfx::Size workspace_size =
@@ skipping 63 matching lines @@
 // static
 void MaximizeModeWindowState::UpdateWindowPosition(
     wm::WindowState* window_state) {
   gfx::Rect bounds_in_parent = GetBoundsInMaximizedMode(window_state);
   if (bounds_in_parent == window_state->window()->GetBounds())
     return;
   window_state->SetBoundsDirect(bounds_in_parent);
 }
 
 MaximizeModeWindowState::MaximizeModeWindowState(
-    aura::Window* window, MaximizeModeWindowManager* creator)
+    WmWindow* window,
+    MaximizeModeWindowManager* creator)
     : window_(window),
       creator_(creator),
-      current_state_type_(wm::GetWindowState(window)->GetStateType()),
+      current_state_type_(window->GetWindowState()->GetStateType()),
       defer_bounds_updates_(false) {
-  old_state_.reset(wm::GetWindowState(window)
+  old_state_.reset(window_->GetWindowState()
                        ->SetStateObject(std::unique_ptr<State>(this))
                        .release());
 }
 
 MaximizeModeWindowState::~MaximizeModeWindowState() {
   creator_->WindowStateDestroyed(window_);
 }
 
 void MaximizeModeWindowState::LeaveMaximizeMode(wm::WindowState* window_state) {
   // Note: When we return we will destroy ourselves with the |our_reference|.
   std::unique_ptr<wm::WindowState::State> our_reference =
       window_state->SetStateObject(std::move(old_state_));
 }
 
 void MaximizeModeWindowState::SetDeferBoundsUpdates(bool defer_bounds_updates) {
   if (defer_bounds_updates_ == defer_bounds_updates)
     return;
 
   defer_bounds_updates_ = defer_bounds_updates;
   if (!defer_bounds_updates_)
-    UpdateBounds(wm::GetWindowState(window_), true);
+    UpdateBounds(window_->GetWindowState(), true);
 }
 
 void MaximizeModeWindowState::OnWMEvent(wm::WindowState* window_state,
                                         const wm::WMEvent* event) {
   switch (event->type()) {
     case wm::WM_EVENT_TOGGLE_FULLSCREEN:
       ToggleFullScreen(window_state, window_state->delegate());
       break;
     case wm::WM_EVENT_FULLSCREEN:
       UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_FULLSCREEN, true);
@@ skipping 71 matching lines @@
 
 wm::WindowStateType MaximizeModeWindowState::GetType() const {
   return current_state_type_;
 }
 
 void MaximizeModeWindowState::AttachState(
     wm::WindowState* window_state,
     wm::WindowState::State* previous_state) {
   current_state_type_ = previous_state->GetType();
 
-  aura::Window* window =
-      ash::WmWindowAura::GetAuraWindow(window_state->window());
   gfx::Rect restore_bounds = GetRestoreBounds(window_state);
   if (!restore_bounds.IsEmpty()) {
     // We do not want to do a session restore to our window states. Therefore
     // we tell the window to use the current default states instead.
-    window->SetProperty(ash::kRestoreShowStateOverrideKey,
-                        window_state->GetShowState());
-    window->SetProperty(ash::kRestoreBoundsOverrideKey,
-                        new gfx::Rect(restore_bounds));
+    window_state->window()->SetRestoreOverrides(restore_bounds,
+                                                window_state->GetShowState());
   }
 
   // Initialize the state to a good preset.
   if (current_state_type_ != wm::WINDOW_STATE_TYPE_MAXIMIZED &&
       current_state_type_ != wm::WINDOW_STATE_TYPE_MINIMIZED &&
       current_state_type_ != wm::WINDOW_STATE_TYPE_FULLSCREEN &&
       current_state_type_ != wm::WINDOW_STATE_TYPE_PINNED) {
     UpdateWindow(window_state,
                  GetMaximizedOrCenteredWindowType(window_state),
                  true);
   }
 
   window_state->set_can_be_dragged(false);
 }
 
 void MaximizeModeWindowState::DetachState(wm::WindowState* window_state) {
   // From now on, we can use the default session restore mechanism again.
-  ash::WmWindowAura::GetAuraWindow(window_state->window())
-      ->ClearProperty(ash::kRestoreBoundsOverrideKey);
+  window_state->window()->SetRestoreOverrides(gfx::Rect(),

[James Cook, 2016/06/27 00:19:21]

I like that you combined these into a single set/clear method. The fact that the
old code never reset kRestoreShowStateOverrideKey was confusing.

+                                              ui::SHOW_STATE_NORMAL);
   window_state->set_can_be_dragged(true);
 }
 
 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 &&
@@ skipping 64 matching lines @@
       // avoid flashing.
       if (window_state->IsMaximized())
         window_state->SetBoundsDirectCrossFade(bounds_in_parent);
       else
         window_state->SetBoundsDirectAnimated(bounds_in_parent);
     }
   }
 }
 
 }  // namespace ash