Move some more WM functionality down into ash.

ash/wm/workspace/workspace_manager.cc

 // Copyright (c) 2011 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 "ui/aura_shell/workspace/workspace_manager.h"
+#include "ash/wm/workspace/workspace_manager.h"
 
 #include <algorithm>
 
+#include "ash/wm/workspace/workspace.h"
+#include "ash/wm/workspace/workspace_observer.h"
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/screen_aura.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/workspace/workspace.h"
-#include "ui/aura_shell/workspace/workspace_observer.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/transform.h"
 
 namespace {
 
 // The horizontal margein between workspaces in pixels.
 const int kWorkspaceHorizontalMargin = 50;
 
@@ skipping 240 matching lines @@
     ui::Transform transform;
     transform.SetTranslateX(-active_workspace_->bounds().x());
     ui::LayerAnimator::ScopedSettings settings(
         contents_view_->layer()->GetAnimator());
     contents_view_->SetTransform(transform);
   }
 }
 
 }  // namespace internal
 }  // namespace aura_shell