Changes all non-workspace code to talk to WorkspaceManager via

ash/wm/shelf_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/shelf_layout_manager.h"
 
 #include <algorithm>
 
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/web_notification/web_notification_tray.h"
-#include "ash/wm/workspace/workspace_manager.h"
+#include "ash/wm/workspace_controller.h"
 #include "base/auto_reset.h"
 #include "base/i18n/rtl.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/event.h"
 #include "ui/aura/event_filter.h"
 #include "ui/aura/root_window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
@@ skipping 94 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // ShelfLayoutManager, public:
 
 ShelfLayoutManager::ShelfLayoutManager(views::Widget* status)
     : root_window_(Shell::GetPrimaryRootWindow()),
       in_layout_(false),
       auto_hide_behavior_(SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT),
       alignment_(SHELF_ALIGNMENT_BOTTOM),
       launcher_(NULL),
       status_(status),
-      workspace_manager_(NULL),
+      workspace_controller_(NULL),
       window_overlaps_shelf_(false) {
   Shell::GetInstance()->AddShellObserver(this);
   aura::client::GetActivationClient(root_window_)->AddObserver(this);
 }
 
 ShelfLayoutManager::~ShelfLayoutManager() {
   FOR_EACH_OBSERVER(Observer, observers_, WillDeleteShelf());
   Shell::GetInstance()->RemoveShellObserver(this);
   aura::client::GetActivationClient(root_window_)->RemoveObserver(this);
 }
@@ skipping 81 matching lines @@
       Shell::GetPrimaryRootWindow(),
       target_bounds.work_area_insets);
   UpdateHitTestBounds();
 }
 
 void ShelfLayoutManager::UpdateVisibilityState() {
   ShellDelegate* delegate = Shell::GetInstance()->delegate();
   if (delegate && delegate->IsScreenLocked()) {
     SetState(VISIBLE);
   } else {
-    WorkspaceManager::WindowState window_state(
-        workspace_manager_->GetWindowState());
+    WorkspaceWindowState window_state(workspace_controller_->GetWindowState());
     switch (window_state) {
-      case WorkspaceManager::WINDOW_STATE_FULL_SCREEN:
+      case WORKSPACE_WINDOW_STATE_FULL_SCREEN:
         SetState(HIDDEN);
         break;
 
-      case WorkspaceManager::WINDOW_STATE_MAXIMIZED:
+      case WORKSPACE_WINDOW_STATE_MAXIMIZED:
         SetState(auto_hide_behavior_ != SHELF_AUTO_HIDE_BEHAVIOR_NEVER ?
                  AUTO_HIDE : VISIBLE);
         break;
 
-      case WorkspaceManager::WINDOW_STATE_WINDOW_OVERLAPS_SHELF:
-      case WorkspaceManager::WINDOW_STATE_DEFAULT:
+      case WORKSPACE_WINDOW_STATE_WINDOW_OVERLAPS_SHELF:
+      case WORKSPACE_WINDOW_STATE_DEFAULT:
         SetState(auto_hide_behavior_ == SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS ?
                  AUTO_HIDE : VISIBLE);
         SetWindowOverlapsShelf(window_state ==
-            WorkspaceManager::WINDOW_STATE_WINDOW_OVERLAPS_SHELF);
+                               WORKSPACE_WINDOW_STATE_WINDOW_OVERLAPS_SHELF);
     }
   }
 }
 
 void ShelfLayoutManager::UpdateAutoHideState() {
   AutoHideState auto_hide_state =
       CalculateAutoHideState(state_.visibility_state);
   if (auto_hide_state != state_.auto_hide_state) {
     if (auto_hide_state == AUTO_HIDE_HIDDEN) {
       // Hides happen immediately.
@@ skipping 338 matching lines @@
 int ShelfLayoutManager::GetWorkAreaSize(const State& state, int size) const {
   if (state.visibility_state == VISIBLE)
     return size;
   if (state.visibility_state == AUTO_HIDE)
     return kAutoHideSize;
   return 0;
 }
 
 }  // namespace internal
 }  // namespace ash