Remove WindowState::IsNormalShowState()

ash/wm/toplevel_window_event_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/toplevel_window_event_handler.h"
 
 #include "ash/shell.h"
 #include "ash/wm/resize_shadow_controller.h"
 #include "ash/wm/window_resizer.h"
 #include "ash/wm/window_state.h"
@@ skipping 27 matching lines @@
 namespace {
 
 // Returns whether |window| can be moved via a two finger drag given
 // the hittest results of the two fingers.
 bool CanStartTwoFingerMove(aura::Window* window,
                            int window_component1,
                            int window_component2) {
   // We allow moving a window via two fingers when the hittest components are
   // HTCLIENT. This is done so that a window can be dragged via two fingers when
   // the tab strip is full and hitting the caption area is difficult. We check
-  // the window type and the show state so that we do not steal touches from the
+  // the window type and the show type so that we do not steal touches from the
   // web contents.
-  if (!ash::wm::GetWindowState(window)->IsNormalShowState() ||
+  if (!wm::GetWindowState(window)->IsNormalOrSnapped() ||
       window->type() != ui::wm::WINDOW_TYPE_NORMAL) {
     return false;
   }
   int component1_behavior =
       WindowResizer::GetBoundsChangeForWindowComponent(window_component1);
   int component2_behavior =
       WindowResizer::GetBoundsChangeForWindowComponent(window_component2);
   return (component1_behavior & WindowResizer::kBoundsChange_Resizes) == 0 &&
       (component2_behavior & WindowResizer::kBoundsChange_Resizes) == 0;
 }
@@ skipping 268 matching lines @@
       CompleteDrag(DRAG_COMPLETE);
       event->StopPropagation();
       return;
     case ui::ET_SCROLL_FLING_START:
       CompleteDrag(DRAG_COMPLETE);
 
       // TODO(pkotwicz): Fix tests which inadvertantly start flings and check
       // window_resizer_->IsMove() instead of the hittest component at |event|'s
       // location.
       if (GetWindowComponent(target, *event) != HTCAPTION ||
-          !wm::GetWindowState(target)->IsNormalShowState()) {
+          !wm::GetWindowState(target)->IsNormalOrSnapped()) {
         return;
       }
 
       if (event->details().velocity_y() > kMinVertVelocityForWindowMinimize) {
         SetWindowShowTypeFromGesture(target, wm::SHOW_TYPE_MINIMIZED);
       } else if (event->details().velocity_y() <
                  -kMinVertVelocityForWindowMinimize) {
         SetWindowShowTypeFromGesture(target, wm::SHOW_TYPE_MAXIMIZED);
       } else if (event->details().velocity_x() >
                  kMinHorizVelocityForWindowSwipe) {
         SetWindowShowTypeFromGesture(target, wm::SHOW_TYPE_RIGHT_SNAPPED);
       } else if (event->details().velocity_x() <
                  -kMinHorizVelocityForWindowSwipe) {
         SetWindowShowTypeFromGesture(target, wm::SHOW_TYPE_LEFT_SNAPPED);
       }
       event->StopPropagation();
       return;
     case ui::ET_GESTURE_MULTIFINGER_SWIPE:
-      if (!wm::GetWindowState(target)->IsNormalShowState())
+      if (!wm::GetWindowState(target)->IsNormalOrSnapped())
         return;
 
       CompleteDrag(DRAG_COMPLETE);
 
       if (event->details().swipe_down())
         SetWindowShowTypeFromGesture(target, wm::SHOW_TYPE_MINIMIZED);
       else if (event->details().swipe_up())
         SetWindowShowTypeFromGesture(target, wm::SHOW_TYPE_MAXIMIZED);
       else if (event->details().swipe_right())
         SetWindowShowTypeFromGesture(target, wm::SHOW_TYPE_RIGHT_SNAPPED);
@@ skipping 236 matching lines @@
 
 void ToplevelWindowEventHandler::ResizerWindowDestroyed() {
   // We explicitly don't invoke RevertDrag() since that may do things to window.
   // Instead we destroy the resizer.
   window_resizer_.reset();
 
   CompleteDrag(DRAG_REVERT);
 }
 
 }  // namespace ash