[Cleanup] Rename WindowSettings to WindowState

ash/wm/gestures/two_finger_drag_handler.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/gestures/two_finger_drag_handler.h"
 
 #include "ash/wm/window_resizer.h"
+#include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/snap_sizer.h"
 #include "ui/aura/client/window_types.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
@@ skipping 66 matching lines @@
   if (!target->delegate())
     return false;
 
   if (event.type() == ui::ET_GESTURE_BEGIN &&
       event.details().touch_points() == 1) {
     first_finger_hittest_ =
         target->delegate()->GetNonClientComponent(event.location());
     return false;
   }
 
+  wm::WindowState* window_state = wm::GetWindowState(target);
+
   if (event.type() == ui::ET_GESTURE_BEGIN &&
       event.details().touch_points() == 2) {
-    if (!window_resizer_.get() && wm::IsWindowNormal(target) &&
+    if (!window_resizer_.get() && window_state->IsNormalShowState() &&
       target->type() == aura::client::WINDOW_TYPE_NORMAL) {
       if (WindowComponentsAllowMoving(first_finger_hittest_,
           target->delegate()->GetNonClientComponent(event.location()))) {
         target->AddObserver(this);
         window_resizer_ = CreateWindowResizer(
             target,
             event.details().bounding_box().CenterPoint(),
             HTCAPTION,
             aura::client::WINDOW_MOVE_SOURCE_TOUCH);
         return true;
       }
     }
 
     return false;
   }
 
   if (!window_resizer_) {
     // Consume all two-finger gestures on a normal window.
     return event.details().touch_points() == 2 &&
            target->type() == aura::client::WINDOW_TYPE_NORMAL &&
-           wm::IsWindowNormal(target);
+           window_state->IsNormalShowState();
   }
 
   if (target != window_resizer_->GetTarget())
     return false;
 
   switch (event.type()) {
     case ui::ET_GESTURE_BEGIN:
       if (event.details().touch_points() > 2)
         Reset();
       return false;
 
     case ui::ET_GESTURE_SCROLL_BEGIN:
     case ui::ET_GESTURE_PINCH_BEGIN:
     case ui::ET_GESTURE_SCROLL_END:
       return true;
 
     case ui::ET_GESTURE_MULTIFINGER_SWIPE: {
       // For a swipe, the window either maximizes, minimizes, or snaps. In this
       // case, cancel the drag, and do the appropriate action.
       Reset();
-
       if (event.details().swipe_up()) {
-        if (wm::CanMaximizeWindow(target))
-          wm::MaximizeWindow(target);
-      } else if (event.details().swipe_down() &&
-                 wm::CanMinimizeWindow(target)) {
-        wm::MinimizeWindow(target);
-      } else if (wm::CanSnapWindow(target)) {
+        if (window_state->CanMaximize())
+          window_state->Maximize();
+      } else if (event.details().swipe_down() && window_state->CanMinimize()) {
+        window_state->Minimize();
+      } else if (window_state->CanSnap()) {
         ui::ScopedLayerAnimationSettings scoped_setter(
             target->layer()->GetAnimator());
         scoped_setter.SetPreemptionStrategy(
             ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS);
         internal::SnapSizer::SnapWindow(target,
             event.details().swipe_left() ? internal::SnapSizer::LEFT_EDGE :
                                            internal::SnapSizer::RIGHT_EDGE);
       }
       return true;
     }
@@ skipping 33 matching lines @@
                                                      bool visible) {
   Reset();
 }
 
 void TwoFingerDragHandler::OnWindowDestroying(aura::Window* window) {
   Reset();
 }
 
 }  // namespace internal
 }  // namespace ash