Removes the grid from ash.

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/shell.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
+#include "ash/wm/workspace/workspace_window_resizer.h"
 #include "base/command_line.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"
 
-namespace {
-
-// Given a |window| and tentative |restore_bounds|, returns new bounds that
-// ensure that at least a few pixels of the screen background are visible
-// outside the edges of the window.  Use this to ensure that restoring a
-// maximized window creates enough space that the resize handles are easily
-// clickable.  We get into this state when updating Chrome OS R18 to R19, as
-// Chrome OS R18 and earlier used only maximized windows and set their restore
-// bounds to the size of the screen.  See crbug.com/108073
-gfx::Rect BoundsWithScreenEdgeVisible(aura::Window* window,
-                                      const gfx::Rect& restore_bounds) {
-  // If the restore_bounds are more than 1 grid step away from the size the
-  // window would be when maximized, inset it.
-  int grid_size = ash::Shell::GetInstance()->GetGridSize();
-  gfx::Rect max_bounds =
-      ash::ScreenAsh::GetMaximizedWindowBoundsInParent(window);
-  max_bounds.Inset(grid_size, grid_size);
-  if (restore_bounds.Contains(max_bounds))
-    return max_bounds;
-  return restore_bounds;
-}
-
-}  // namespace
-
 namespace ash {
 namespace internal {
 
 /////////////////////////////////////////////////////////////////////////////
 // BaseLayoutManager, public:
 
 BaseLayoutManager::BaseLayoutManager(aura::RootWindow* root_window)
     : root_window_(root_window) {
   Shell::GetInstance()->AddShellObserver(this);
   root_window_->AddRootWindowObserver(this);
   root_window_->AddObserver(this);
 }
 
 BaseLayoutManager::~BaseLayoutManager() {
   if (root_window_) {
     root_window_->RemoveObserver(this);
     root_window_->RemoveRootWindowObserver(this);
   }
   for (WindowSet::const_iterator i = windows_.begin(); i != windows_.end(); ++i)
     (*i)->RemoveObserver(this);
   Shell::GetInstance()->RemoveShellObserver(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 (restore_bounds.Contains(max_bounds))
+    return max_bounds;
+  return restore_bounds;
+}
+
 /////////////////////////////////////////////////////////////////////////////
 // BaseLayoutManager, LayoutManager overrides:
 
 void BaseLayoutManager::OnWindowResized() {
 }
 
 void BaseLayoutManager::OnWindowAddedToLayout(aura::Window* child) {
   windows_.insert(child);
   child->AddObserver(this);
   // Only update the bounds if the window has a show state that depends on the
@@ skipping 177 matching lines @@
       gfx::Rect display_rect =
           ScreenAsh::GetDisplayWorkAreaBoundsInParent(window);
       // Put as much of the window as possible within the display area.
       window->SetBounds(window->bounds().AdjustToFit(display_rect));
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash