[Cleanup] Rename WindowSettings to WindowState

chrome/browser/ui/ash/window_positioner.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 "chrome/browser/ui/ash/window_positioner.h"
 
 #include "ash/shell.h"
 #include "ash/wm/mru_window_tracker.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/compositor/layer.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 
 // statics
 
@@ skipping 82 matching lines @@
   const std::vector<aura::Window*> windows =
       ash::MruWindowTracker::BuildWindowList(false);
 
   std::vector<const gfx::Rect*> regions;
   // Process the window list and check if we can bail immediately.
   for (size_t i = 0; i < windows.size(); i++) {
     // We only include opaque and visible windows.
     if (windows[i] && windows[i]->IsVisible() && windows[i]->layer() &&
         (!windows[i]->transparent() ||
          windows[i]->layer()->GetTargetOpacity() == 1.0)) {
+      ash::wm::WindowState* window_state = ash::wm::GetWindowState(windows[i]);
       // When any window is maximized we cannot find any free space.
-      if (ash::wm::IsWindowMaximized(windows[i]) ||
-          ash::wm::IsWindowFullscreen(windows[i]))
+      if (window_state->IsMaximizedOrFullscreen())
         return gfx::Rect(0, 0, 0, 0);
-      if (ash::wm::IsWindowNormal(windows[i]))
+      if (window_state->IsNormalShowState())
         regions.push_back(&windows[i]->bounds());
     }
   }
 
   if (regions.empty())
     return gfx::Rect(0, 0, 0, 0);
 
   int w = old_pos.width();
   int h = old_pos.height();
   int x_end = work_area.width() / 2;
@@ skipping 51 matching lines @@
   // If the alignment was pushing the window out of the screen, we ignore the
   // alignment for that call.
   if (abs(pos.right() - work_area.right()) < grid)
     x = work_area.right() - w;
   if (abs(pos.bottom() - work_area.bottom()) < grid)
     y = work_area.bottom() - h;
   return gfx::Rect(x, y, w, h);
 }
 
 }  // namespace ash