Changes all non-workspace code to talk to WorkspaceManager via

ash/wm/shelf_layout_manager.h

 // 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.
 
 #ifndef ASH_WM_SHELF_LAYOUT_MANAGER_H_
 #define ASH_WM_SHELF_LAYOUT_MANAGER_H_
 
 #include "ash/ash_export.h"
 #include "ash/launcher/launcher.h"
 #include "ash/shell_observer.h"
@@ skipping 14 matching lines @@
 
 namespace views {
 class Widget;
 }
 
 namespace ash {
 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
 // width of the status area. This allows the launcher to draw the background and
 // layout to the status area.
 // To respond to bounds changes in the status area StatusAreaLayoutManager works
 // closely with ShelfLayoutManager.
 class ASH_EXPORT ShelfLayoutManager :
     public aura::LayoutManager,
     public ash::ShellObserver,
@@ skipping 45 matching lines @@
   void SetAutoHideBehavior(ShelfAutoHideBehavior behavior);
   ShelfAutoHideBehavior auto_hide_behavior() const {
     return auto_hide_behavior_;
   }
 
   // Sets the alignment. Returns true if the alignment is changed. Otherwise,
   // returns false.
   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() {
     return launcher_ ? launcher_->widget() : NULL;
   }
   const views::Widget* launcher_widget() const {
     return launcher_ ? launcher_->widget() : NULL;
   }
   views::Widget* status() { return status_; }
 
@@ skipping 141 matching lines @@
   ShelfAutoHideBehavior auto_hide_behavior_;
 
   ShelfAlignment alignment_;
 
   // Current state.
   State state_;
 
   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_;
 
   base::OneShotTimer<ShelfLayoutManager> auto_hide_timer_;
 
   // EventFilter used to detect when user moves the mouse over the launcher to
   // trigger showing the launcher.
   scoped_ptr<AutoHideEventFilter> event_filter_;
 
   ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_SHELF_LAYOUT_MANAGER_H_