[Cleanup] Rename WindowSettings to WindowState

ash/wm/ash_focus_rules.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/ash_focus_rules.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
-#include "ash/wm/window_util.h"
+#include "ash/wm/window_state.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 namespace wm {
 namespace {
 
 // These are the list of container ids of containers which may contain windows
 // that need to be activated in the order that they should be activated.
 const int kWindowContainerIds[] = {
     internal::kShellWindowId_LockSystemModalContainer,
@@ skipping 47 matching lines @@
   return false;
 }
 
 bool AshFocusRules::IsWindowConsideredVisibleForActivation(
     aura::Window* window) const {
   if (BaseFocusRules::IsWindowConsideredVisibleForActivation(window))
     return true;
 
   // Minimized windows are hidden in their minimized state, but they can always
   // be activated.
-  if (wm::IsWindowMinimized(window))
+  if (wm::GetWindowState(window)->IsMinimized())
     return true;
 
   return window->TargetVisibility() && (window->parent()->id() ==
       internal::kShellWindowId_DefaultContainer || window->parent()->id() ==
       internal::kShellWindowId_LockScreenContainer);
 }
 
 bool AshFocusRules::CanActivateWindow(aura::Window* window) const {
   // Clearing activation is always permissible.
   if (!window)
@@ skipping 59 matching lines @@
   return window;
 }
 
 aura::Window* AshFocusRules::GetTopmostWindowToActivateInContainer(
     aura::Window* container,
     aura::Window* ignore) const {
   for (aura::Window::Windows::const_reverse_iterator i =
            container->children().rbegin();
        i != container->children().rend();
        ++i) {
-    if (*i != ignore && CanActivateWindow(*i) && !wm::IsWindowMinimized(*i))
+    WindowState* window_state = GetWindowState(*i);
+    if (*i != ignore &&
+        window_state->CanActivate() &&
+        !window_state->IsMinimized())
       return *i;
   }
   return NULL;
 }
 
 }  // namespace wm
 }  // namespace ash