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

ash/wm/workspace/workspace_window_resizer.h

 // 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.
 
 #ifndef ASH_WM_WORKSPACE_WINDOW_RESIZER_H_
 #define ASH_WM_WORKSPACE_WINDOW_RESIZER_H_
 
 #include <vector>
 
 #include "ash/wm/window_resizer.h"
@@ skipping 43 matching lines @@
   static WorkspaceWindowResizer* Create(
       wm::WindowState* window_state,
       const std::vector<aura::Window*>& attached_windows);
 
   // WindowResizer:
   void Drag(const gfx::Point& location_in_parent, int event_flags) override;
   void CompleteDrag() override;
   void RevertDrag() override;
 
  private:
-  WorkspaceWindowResizer(wm::WindowState* window_state,
-                         const std::vector<aura::Window*>& attached_windows);
-
- private:
   friend class WorkspaceWindowResizerTest;
 
   // The edge to which the window should be snapped at the end of the drag.
-  enum SnapType {
-    SNAP_LEFT,
-    SNAP_RIGHT,
-    SNAP_NONE
-  };
+  enum SnapType { SNAP_LEFT, SNAP_RIGHT, SNAP_NONE };
+
+  WorkspaceWindowResizer(wm::WindowState* window_state,
+                         const std::vector<aura::Window*>& attached_windows);
 
   // Lays out the attached windows. |bounds| is the bounds of the main window.
   void LayoutAttachedWindows(gfx::Rect* bounds);
 
   // Calculates the new sizes of the attached windows, given that the main
   // window has been resized (along the primary axis) by |delta|.
   // |available_size| is the maximum length of the space that the attached
   // windows are allowed to occupy (ie: the distance between the right/bottom
   // edge of the primary window and the right/bottom of the desktop area).
   // Populates |sizes| with the desired sizes of the attached windows, and
@@ skipping 136 matching lines @@
   // Used to determine if this has been deleted during a drag such as when a tab
   // gets dragged into another browser window.
   base::WeakPtrFactory<WorkspaceWindowResizer> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceWindowResizer);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_WORKSPACE_WINDOW_RESIZER_H_