Changes all non-workspace code to talk to WorkspaceManager via

ash/wm/shelf_layout_manager.h

Index: ash/wm/shelf_layout_manager.h
diff --git a/ash/wm/shelf_layout_manager.h b/ash/wm/shelf_layout_manager.h
index a61c2db414c682d516b546059eeac59fbf2bdc3f..5797a59db74a12fbfacfaf67a8040822b06b086d 100644
--- a/ash/wm/shelf_layout_manager.h
+++ b/ash/wm/shelf_layout_manager.h
@@ -32,7 +32,7 @@ class ScreenAsh;
 namespace internal {
 
 class ShelfLayoutManagerTest;
-class WorkspaceManager;
+class WorkspaceController;
 
 // ShelfLayoutManager is the layout manager responsible for the launcher and
 // status widgets. The launcher is given the total available width and told the
@@ -98,8 +98,8 @@ class ASH_EXPORT ShelfLayoutManager :
   bool SetAlignment(ShelfAlignment alignment);
   ShelfAlignment alignment() const { return alignment_; }
 
-  void set_workspace_manager(WorkspaceManager* manager) {
-    workspace_manager_ = manager;
+  void set_workspace_controller(WorkspaceController* controller) {
+    workspace_controller_ = controller;
   }
 
   views::Widget* launcher_widget() {
@@ -261,7 +261,7 @@ class ASH_EXPORT ShelfLayoutManager :
   Launcher* launcher_;
   views::Widget* status_;
 
-  WorkspaceManager* workspace_manager_;
+  WorkspaceController* workspace_controller_;
 
   // Do any windows overlap the shelf? This is maintained by WorkspaceManager.
   bool window_overlaps_shelf_;