[Cleanup] Rename WindowSettings to WindowState

ash/wm/workspace/snap_sizer.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 "ash/wm/workspace/snap_sizer.h"
 
 #include <cmath>
 
 #include "ash/ash_switches.h"
 #include "ash/screen_ash.h"
-#include "ash/wm/property_util.h"
 #include "ash/wm/window_resizer.h"
+#include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 namespace internal {
 
 namespace {
 
@@ skipping 95 matching lines @@
       ideal_width_list.push_back(minimum_width);
     else
       ideal_width_list.push_back(maximum_width);
   }
 
   return ideal_width_list;
 }
 
 // Changes |window|'s bounds to |snap_bounds| while preserving the restore
 // bounds.
-void SnapWindowToBounds(aura::Window* window, const gfx::Rect& snap_bounds) {
-  if (wm::IsWindowMaximized(window) || wm::IsWindowFullscreen(window)) {
+void SnapWindowToBounds(wm::WindowState* window_state,
+                        const gfx::Rect& snap_bounds) {
+  if (window_state->IsMaximizedOrFullscreen()) {
     // Before we can set the bounds we need to restore the window.
     // Restoring the window will set the window to its restored bounds.
     // To avoid an unnecessary bounds changes (which may have side effects)
     // we set the restore bounds to the bounds we want, restore the window,
     // then reset the restore bounds. This way no unnecessary bounds
     // changes occurs and the original restore bounds is remembered.
-    gfx::Rect restore_bounds_in_screen = *GetRestoreBoundsInScreen(window);
-    SetRestoreBoundsInParent(window, snap_bounds);
-    wm::RestoreWindow(window);
-    SetRestoreBoundsInScreen(window, restore_bounds_in_screen);
+    gfx::Rect restore_bounds_in_screen =
+        window_state->GetRestoreBoundsInScreen();
+    window_state->SetRestoreBoundsInParent(snap_bounds);
+    window_state->Restore();
+    window_state->SetRestoreBoundsInScreen(restore_bounds_in_screen);
   } else {
-    window->SetBounds(snap_bounds);
+    window_state->window()->SetBounds(snap_bounds);
   }
 }
 
 }  // namespace
 
 SnapSizer::SnapSizer(aura::Window* window,
                      const gfx::Point& start,
                      Edge edge,
                      InputType input_type)
     : window_(window),
       edge_(edge),
       time_last_update_(base::TimeTicks::Now()),
       size_index_(0),
       end_of_sequence_(false),
       resize_disabled_(false),
       num_moves_since_adjust_(0),
       last_adjust_x_(start.x()),
       last_update_x_(start.x()),
       start_x_(start.x()),
       input_type_(input_type),
       usable_width_(BuildIdealWidthList(window)) {
   DCHECK(!usable_width_.empty());
   target_bounds_ = GetTargetBounds();
 }
 
 SnapSizer::~SnapSizer() {
 }
 
 void SnapSizer::SnapWindow(aura::Window* window, SnapSizer::Edge edge) {
-  if (!wm::CanSnapWindow(window))
+  wm::WindowState* window_state = wm::GetWindowState(window);
+  if (!window_state->CanSnap())
     return;
-  internal::SnapSizer sizer(window, gfx::Point(), edge,
+  internal::SnapSizer sizer(window_state->window(), gfx::Point(), edge,

[James Cook, 2013/09/19 03:49:53]

nit: Maybe just use |window|?

[oshima, 2013/09/19 17:44:05]

Done.

       internal::SnapSizer::OTHER_INPUT);
-  SnapWindowToBounds(window, sizer.GetSnapBounds(window->bounds()));
+  SnapWindowToBounds(window_state,
+                     sizer.GetSnapBounds(window_state->window()->bounds()));
 }
 
 void SnapSizer::SnapWindowToTargetBounds() {
-  SnapWindowToBounds(window_, target_bounds());
+  SnapWindowToBounds(wm::GetWindowState(window_), target_bounds());
 }
 
 void SnapSizer::Update(const gfx::Point& location) {
   // See description above for details on this behavior.
   num_moves_since_adjust_++;
   if ((base::TimeTicks::Now() - time_last_update_).InMilliseconds() >
       kDelayBeforeIncreaseMS) {
     ChangeBounds(location.x(),
                  CalculateIncrement(location.x(), last_update_x_));
   } else {
@@ skipping 98 matching lines @@
   return GetTargetBoundsForSize(size_index_);
 }
 
 bool SnapSizer::AlongEdge(int x) const {
   gfx::Rect area(ScreenAsh::GetDisplayWorkAreaBoundsInParent(window_));
   return (x <= area.x()) || (x >= area.right() - 1);
 }
 
 }  // namespace internal
 }  // namespace ash