Adjusts dragging logic to be less likely to trigger false positive switch from snapping to docking

ash/wm/workspace/two_step_edge_cycler.h

Index: ash/wm/workspace/two_step_edge_cycler.h
diff --git a/ash/wm/workspace/two_step_edge_cycler.h b/ash/wm/workspace/two_step_edge_cycler.h
index 01ca0866220f7808eacd3e769c99bed948e842f9..a2e929d5e72769770e5728cc0d3af127a3d89cf0 100644
--- a/ash/wm/workspace/two_step_edge_cycler.h
+++ b/ash/wm/workspace/two_step_edge_cycler.h
@@ -6,6 +6,7 @@
 #define ASH_WM_WORKSPACE_TWO_STEP_EDGE_CYCLER_H_
 
 #include "ash/ash_export.h"
+#include "ash/wm/workspace/workspace_window_resizer.h"
 #include "base/basictypes.h"
 #include "base/time/time.h"
 #include "ui/gfx/geometry/point.h"
@@ -19,7 +20,7 @@ namespace ash {
 // the workspace.
 class ASH_EXPORT TwoStepEdgeCycler {
  public:
-  explicit TwoStepEdgeCycler(const gfx::Point& start);
+  explicit TwoStepEdgeCycler(const gfx::Point& start, SnapType snap_type);
   ~TwoStepEdgeCycler();
 
   // Update which mode should be used as a result of a mouse / touch move.
@@ -41,6 +42,15 @@ class ASH_EXPORT TwoStepEdgeCycler {
   // Initial x-coordinate.
   int start_x_;
 
+  // x-coordinate when paused.
+  int paused_x_;
+
+  // Whether the movement was paused.
+  bool paused_;
+
+  // Determines a movement direction that we are watching after a pause.
+  SnapType snap_type_;

[pkotwicz, 2015/05/07 17:10:28]

Can we use a different enum? I find it kind of ugly to use the enum from
WorkspaceWindowResizer. (Especially since we do not care for the SNAP_NONE
value.

[varkha, 2015/05/07 20:27:28]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(TwoStepEdgeCycler);
 };