Changes all non-workspace code to talk to WorkspaceManager via

ash/shell.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/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
@@ skipping 47 matching lines @@
 #include "ash/wm/toplevel_window_event_filter.h"
 #include "ash/wm/user_activity_detector.h"
 #include "ash/wm/video_detector.h"
 #include "ash/wm/visibility_controller.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_modality_controller.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/workspace/workspace_event_filter.h"
 #include "ash/wm/workspace/workspace_layout_manager.h"
-#include "ash/wm/workspace/workspace_manager.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/user_action_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/display_manager.h"
@@ skipping 575 matching lines @@
 
 SystemTrayDelegate* Shell::tray_delegate() {
   return status_area_widget_->system_tray_delegate();
 }
 
 SystemTray* Shell::system_tray() {
   return status_area_widget_->system_tray();
 }
 
 int Shell::GetGridSize() const {
-  return GetPrimaryRootWindowController()->workspace_controller()->
-      workspace_manager()->grid_size();
+  return
+      GetPrimaryRootWindowController()->workspace_controller()->GetGridSize();
 }
 
 void Shell::InitRootWindowForSecondaryDisplay(aura::RootWindow* root) {
   root->set_focus_manager(focus_manager_.get());
   if (internal::DisplayController::IsExtendedDesktopEnabled()) {
     internal::RootWindowController* controller =
         new internal::RootWindowController(root);
     controller->CreateContainers();
     InitRootWindowController(controller);
     controller->root_window_layout()->OnWindowResized();
@@ skipping 70 matching lines @@
       new internal::ShelfLayoutManager(status_area_widget_);
   controller->GetContainer(internal::kShellWindowId_LauncherContainer)->
       SetLayoutManager(shelf_layout_manager);
   shelf_ = shelf_layout_manager;
 
   internal::StatusAreaLayoutManager* status_area_layout_manager =
       new internal::StatusAreaLayoutManager(shelf_layout_manager);
   controller->GetContainer(internal::kShellWindowId_StatusContainer)->
       SetLayoutManager(status_area_layout_manager);
 
-  shelf_layout_manager->set_workspace_manager(
-      controller->workspace_controller()->workspace_manager());
+  shelf_layout_manager->set_workspace_controller(
+      controller->workspace_controller());
 
   // TODO(oshima): Support multiple displays.
-  controller->workspace_controller()->workspace_manager()->
-      set_shelf(shelf());
+  controller->workspace_controller()->SetShelf(shelf());
 
   // Create Panel layout manager
   aura::Window* panel_container = GetContainer(
       GetPrimaryRootWindow(),
       internal::kShellWindowId_PanelContainer);
   panel_layout_manager_ =
       new internal::PanelLayoutManager(panel_container);
   panel_container->SetEventFilter(
       new internal::PanelWindowEventFilter(
           panel_container, panel_layout_manager_));
   panel_container->SetLayoutManager(panel_layout_manager_);
 }
 
+// TODO: this is only used in tests, move with test.
 void Shell::DisableWorkspaceGridLayout() {
   RootWindowControllerList controllers = GetAllRootWindowControllers();
   for (RootWindowControllerList::iterator iter = controllers.begin();
        iter != controllers.end(); ++iter)
-    (*iter)->workspace_controller()->workspace_manager()->set_grid_size(0);
+    (*iter)->workspace_controller()->SetGridSize(0);
 }
 
 void Shell::SetCursor(gfx::NativeCursor cursor) {
   RootWindowList root_windows = GetAllRootWindows();
   for (RootWindowList::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter)
     (*iter)->SetCursor(cursor);
 }
 
 void Shell::ShowCursor(bool visible) {
   RootWindowList root_windows = GetAllRootWindows();
   for (RootWindowList::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter)
     (*iter)->ShowCursor(visible);
 }
 
 }  // namespace ash