Add ash-enable-sticky-edges for 'sticky' instead of 'snap' behavior.

ash/wm/workspace/workspace_window_resizer.h

Index: ash/wm/workspace/workspace_window_resizer.h
diff --git a/ash/wm/workspace/workspace_window_resizer.h b/ash/wm/workspace/workspace_window_resizer.h
index 4c71285471a31a7e4d7b614bd166d10bb2fbaaf0..fe8d680977d54ec07c2dd39dc52d1606d2eaaad2 100644
--- a/ash/wm/workspace/workspace_window_resizer.h
+++ b/ash/wm/workspace/workspace_window_resizer.h
@@ -116,11 +116,11 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
 
   // If possible snaps the window to a neary window. Updates |bounds| if there
   // was a close enough window.
-  void MagneticallySnapToOtherWindows(gfx::Rect* bounds);
+  void MagneticallyStickToOtherWindows(gfx::Rect* bounds);
 
   // If possible snaps the resize to a neary window. Updates |bounds| if there
   // was a close enough window.
-  void MagneticallySnapResizeToOtherWindows(gfx::Rect* bounds);
+  void MagneticallyStickResizeToOtherWindows(gfx::Rect* bounds);

[varkha, 2013/04/16 02:12:12]

nit: To be consistent with StickyResizeToWorkAreaBounds the name should be
MagneticallyStickyResizeToOtherWindows.

[stevenjb, 2013/04/16 20:08:20]

Done.

 
   // Finds the neareset window to magentically snap to. Updates
   // |magnetism_window_| and |magnetism_edge_| appropriately. |edges| is a
@@ -129,21 +129,17 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
   bool UpdateMagnetismWindow(const gfx::Rect& bounds, uint32 edges);
 
   // Adjusts the bounds of the window: magnetically snapping, ensuring the
-  // window has enough on screen... |snap_size| is the distance from an edge of
-  // the work area before the window is snapped. A value of 0 results in no
-  // snapping.
-  void AdjustBoundsForMainWindow(int snap_size, gfx::Rect* bounds);
+  // window has enough on screen. If |is_sticky| is true, windows will stick
+  // to the edges of the workspace and magnetically snap to other windows.
+  void AdjustBoundsForMainWindow(bool is_sticky, gfx::Rect* bounds);
 
   // Snaps the window bounds to the work area edges if necessary.
-  void SnapToWorkAreaEdges(
-      const gfx::Rect& work_area,
-      int snap_size,
-      gfx::Rect* bounds) const;
+  void StickToWorkAreaEdges(const gfx::Rect& work_area,
+                            gfx::Rect* bounds) const;
 
   // Snaps the window bounds to the work area during a resize.
-  void SnapResizeToWorkAreaBounds(const gfx::Rect& work_area,
-                                  int snap_size,
-                                  gfx::Rect* bounds) const;
+  void StickyResizeToWorkAreaBounds(const gfx::Rect& work_area,
+                                    gfx::Rect* bounds) const;
 
   // Returns a coordinate along the primary axis. Used to share code for
   // left/right multi window resize and top/bottom resize.