Revert of Revert of Fixes dragging to be less likely to trigger false positive switch to docking

ash/wm/workspace/workspace_window_resizer.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/workspace/workspace_window_resizer.h"
 
 #include <algorithm>
 #include <cmath>
 #include <utility>
 #include <vector>
@@ skipping 923 matching lines @@
     SetDraggedWindowDocked(false);
     snap_type_ = GetSnapType(location);
   }
   const bool can_snap = snap_type_ != SNAP_NONE && window_state()->CanSnap();
   if (!can_snap && !can_dock) {
     snap_type_ = SNAP_NONE;
     snap_phantom_window_controller_.reset();
     edge_cycler_.reset();
     return;
   }
-  if (!edge_cycler_)
-    edge_cycler_.reset(new TwoStepEdgeCycler(location));
-  else
+  if (!edge_cycler_) {
+    edge_cycler_.reset(new TwoStepEdgeCycler(
+        location, snap_type_ == SNAP_LEFT
+                      ? TwoStepEdgeCycler::DIRECTION_LEFT
+                      : TwoStepEdgeCycler::DIRECTION_RIGHT));
+  } else {
     edge_cycler_->OnMove(location);
+  }
 
   // Update phantom window with snapped or docked guide bounds.
   // Windows that cannot be snapped or are less wide than kMaxDockWidth can get
   // docked without going through a snapping sequence.
   gfx::Rect phantom_bounds;
   const bool should_dock = can_dock &&
       (!can_snap ||
        GetTarget()->bounds().width() <=
            DockedWindowLayoutManager::kMaxDockWidth ||
        edge_cycler_->use_second_mode() ||
@@ skipping 92 matching lines @@
          snapped_type == wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED);
   gfx::Rect snapped_bounds = ScreenUtil::GetDisplayWorkAreaBoundsInParent(
       GetTarget());
   if (snapped_type == wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED)
     snapped_bounds.set_x(snapped_bounds.right() - bounds_in_parent.width());
   snapped_bounds.set_width(bounds_in_parent.width());
   return bounds_in_parent == snapped_bounds;
 }
 
 }  // namespace ash