Removes the grid from ash.

ash/wm/workspace/workspace_manager2.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/workspace/workspace_manager2.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "ash/root_window_controller.h"
@@ skipping 77 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(WorkspaceManagerLayoutManager2);
 };
 
 }  // namespace
 
 // WorkspaceManager2 -----------------------------------------------------------
 
 WorkspaceManager2::WorkspaceManager2(Window* contents_view)
     : contents_view_(contents_view),
       active_workspace_(NULL),
-      grid_size_(0),
       shelf_(NULL),
       in_move_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           clear_unminimizing_workspace_factory_(this)) {
   // Clobber any existing event filter.
   contents_view->SetEventFilter(NULL);
   // |contents_view| takes ownership of WorkspaceManagerLayoutManager2.
   contents_view->SetLayoutManager(
       new WorkspaceManagerLayoutManager2(contents_view));
   active_workspace_ = CreateWorkspace(false);
@@ skipping 29 matching lines @@
 // static
 bool WorkspaceManager2::WillRestoreMaximized(Window* window) {
   return wm::IsWindowMinimized(window) &&
       IsMaximizedState(window->GetProperty(internal::kRestoreShowStateKey));
 }
 
 bool WorkspaceManager2::IsInMaximizedMode() const {
   return active_workspace_ && active_workspace_->is_maximized();
 }
 
-void WorkspaceManager2::SetGridSize(int size) {
-  grid_size_ = size;
-  std::for_each(workspaces_.begin(), workspaces_.end(),
-                std::bind2nd(std::mem_fun(&Workspace2::SetGridSize),
-                             grid_size_));
-  std::for_each(pending_workspaces_.begin(), pending_workspaces_.end(),
-                std::bind2nd(std::mem_fun(&Workspace2::SetGridSize),
-                             grid_size_));
-}
-
-int WorkspaceManager2::GetGridSize() const {
-  return grid_size_;
-}
-
 WorkspaceWindowState WorkspaceManager2::GetWindowState() const {
   if (!shelf_)
     return WORKSPACE_WINDOW_STATE_DEFAULT;
 
   const gfx::Rect shelf_bounds(shelf_->GetIdealBounds());
   const Window::Windows& windows(active_workspace_->window()->children());
   bool window_overlaps_launcher = false;
   bool has_maximized_window = false;
   for (Window::Windows::const_iterator i = windows.begin();
        i != windows.end(); ++i) {
@@ skipping 151 matching lines @@
   }
 }
 
 WorkspaceManager2::Workspaces::iterator
 WorkspaceManager2::FindWorkspace(Workspace2* workspace)  {
   return std::find(workspaces_.begin(), workspaces_.end(), workspace);
 }
 
 Workspace2* WorkspaceManager2::CreateWorkspace(bool maximized) {
   Workspace2* workspace = new Workspace2(this, contents_view_, maximized);
-  workspace->SetGridSize(grid_size_);
   workspace->window()->SetLayoutManager(new WorkspaceLayoutManager2(workspace));
   return workspace;
 }
 
 void WorkspaceManager2::MoveWorkspaceToPendingOrDelete(
     Workspace2* workspace,
     Window* stack_beneath,
     AnimateType animate_type) {
   // We're all ready moving windows.
   if (in_move_)
@@ skipping 190 matching lines @@
       if (last_show_state == ui::SHOW_STATE_MINIMIZED)
         SetUnminimizingWorkspace(new_workspace ? new_workspace : workspace);
       DCHECK(!old_layer);
     }
   }
   UpdateShelfVisibility();
 }
 
 }  // namespace internal
 }  // namespace ash