[Cleanup] Rename WindowSettings to WindowState

ash/wm/window_resizer.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/window_resizer.h"
 
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/dock/docked_window_layout_manager.h"
-#include "ash/wm/property_util.h"
+#include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
@@ skipping 76 matching lines @@
 
 // static
 const int WindowResizer::kBoundsChangeDirection_None = 0;
 // static
 const int WindowResizer::kBoundsChangeDirection_Horizontal = 1;
 // static
 const int WindowResizer::kBoundsChangeDirection_Vertical = 2;
 
 WindowResizer::Details::Details()
     : window(NULL),
+      window_state(NULL),
       window_component(HTNOWHERE),
       bounds_change(0),
       position_change_direction(0),
       size_change_direction(0),
       is_resizable(false),
       source(aura::client::WINDOW_MOVE_SOURCE_MOUSE) {
 }
 
 WindowResizer::Details::Details(aura::Window* window,
                                 const gfx::Point& location,
                                 int window_component,
                                 aura::client::WindowMoveSource source)
     : window(window),
+      window_state(wm::GetWindowState(window)),
       initial_bounds_in_parent(window->bounds()),
       restore_bounds(gfx::Rect()),
       initial_location_in_parent(location),
       initial_opacity(window->layer()->opacity()),
       window_component(window_component),
       bounds_change(GetBoundsChangeForWindowComponent(window_component)),
       position_change_direction(
           GetPositionChangeDirectionForWindowComponent(window_component)),
       size_change_direction(
           GetSizeChangeDirectionForWindowComponent(window_component)),
       is_resizable(bounds_change != kBoundsChangeDirection_None),
       source(source) {
-  if (wm::IsWindowNormal(window) &&
-      GetRestoreBoundsInScreen(window) &&
+  if (window_state->IsNormalShowState() &&
+      window_state->HasRestoreBounds() &&
       window_component == HTCAPTION)
-    restore_bounds = *GetRestoreBoundsInScreen(window);
+    restore_bounds = window_state->GetRestoreBoundsInScreen();
 }
 
 WindowResizer::Details::~Details() {
 }
 
 WindowResizer::WindowResizer() {
 }
 
 WindowResizer::~WindowResizer() {
 }
@@ skipping 268 matching lines @@
     if (height > max_height) {
       height = max_height;
       *delta_y = -y_multiplier * (details.initial_bounds_in_parent.height() -
                                   max_height);
     }
   }
   return height;
 }
 
 }  // namespace aura