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

ash/wm/base_layout_manager.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/base_layout_manager.h"
 
+#include "ash/ash_switches.h"
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace_window_resizer.h"
+#include "base/command_line.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/corewm/corewm_switches.h"
 #include "ui/views/corewm/window_util.h"
 
@@ skipping 21 matching lines @@
   Shell::GetInstance()->RemoveShellObserver(this);
   Shell::GetInstance()->activation_client()->RemoveObserver(this);
 }
 
 // static
 gfx::Rect BaseLayoutManager::BoundsWithScreenEdgeVisible(
     aura::Window* window,
     const gfx::Rect& restore_bounds) {
   gfx::Rect max_bounds =
       ash::ScreenAsh::GetMaximizedWindowBoundsInParent(window);
-  // If the restore_bounds are more than 1 grid step away from the size the
-  // window would be when maximized, inset it.
-  max_bounds.Inset(ash::internal::WorkspaceWindowResizer::kScreenEdgeInset,
-                   ash::internal::WorkspaceWindowResizer::kScreenEdgeInset);
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kAshEnableStickyEdges)) {

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

This changes the behavior of restore after a normal window was resized close to
or touching the edges, then maximized and then restored again. Under the flag
the window is no longer inset and is allowed to remain stuck to the edge(s).
This could be described in the bug report.

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

I'm going to revert this until discussing with UX.

+    // If the restore_bounds are more than 1 grid step away from the size the
+    // window would be when maximized, inset it.
+    max_bounds.Inset(ash::internal::WorkspaceWindowResizer::kScreenEdgeInset,
+                     ash::internal::WorkspaceWindowResizer::kScreenEdgeInset);
+  }
   if (restore_bounds.Contains(max_bounds))
     return max_bounds;
   return restore_bounds;
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // BaseLayoutManager, LayoutManager overrides:
 
 void BaseLayoutManager::OnWindowResized() {
 }
@@ skipping 176 matching lines @@
       // Put as much of the window as possible within the display area.
       gfx::Rect bounds = window->bounds();
       bounds.AdjustToFit(display_rect);
       window->SetBounds(bounds);
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash