Remove WindowState::IsNormalShowState()

ash/wm/dock/docked_window_resizer.cc

 // Copyright 2013 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/dock/docked_window_resizer.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
@@ skipping 209 matching lines @@
   did_move_or_resize_ = false;
   aura::Window* window = GetTarget();
   const bool is_attached_panel = window->type() == ui::wm::WINDOW_TYPE_PANEL &&
                                  window_state_->panel_attached();
   const bool is_resized =
       (details().bounds_change & WindowResizer::kBoundsChange_Resizes) != 0;
 
   // Undock the window if it is not in the normal or minimized show type. This
   // happens if a user snaps or maximizes a window using a keyboard shortcut
   // while it is being dragged.
-  if (window_state_->IsSnapped()) {
+  if (!window_state_->IsMinimized() && !window_state_->IsNormalShowType())
     is_docked_ = false;
-  } else if (!window_state_->IsMinimized() &&
-             !window_state_->IsNormalShowState()) {
-    is_docked_ = false;
-  }
 
   // When drag is completed the dragged docked window is resized to the bounds
   // calculated by the layout manager that conform to other docked windows.
   if (!is_attached_panel && is_docked_ && !is_resized) {
     gfx::Rect bounds = ScreenUtil::ConvertRectFromScreen(
         window->parent(), dock_layout_->dragged_bounds());
     if (!bounds.IsEmpty() && bounds.width() != window->bounds().width()) {
       window->SetBounds(bounds);
     }
   }
@@ skipping 76 matching lines @@
   // before.
   if (is_docked_) {
     wm::GetWindowState(window)->set_bounds_changed_by_user(
         was_docked_ && (is_resized || was_bounds_changed_by_user_));
   }
   return action;
 }
 
 }  // namespace internal
 }  // namespace ash