Move some more WM functionality down into ash.

ash/wm/workspace_controller.h

 // 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.
 
 #ifndef UI_AURA_SHELL_WORKSPACE_CONTROLLER_H_
 #define UI_AURA_SHELL_WORKSPACE_CONTROLLER_H_
 #pragma once
 
+#include "ash/wm/workspace/workspace_observer.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/root_window_observer.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura_shell/aura_shell_export.h"
 #include "ui/aura_shell/launcher/launcher_model_observer.h"
-#include "ui/aura_shell/workspace/workspace_observer.h"
 
 namespace aura {
 class Window;
 }
 
 namespace gfx {
 class Size;
 }
 
 namespace aura_shell {
@@ skipping 56 matching lines @@
   // Used to prevent infinite recursive call between the workspace and launcher.
   bool ignore_move_event_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceController);
 };
 
 }  // namespace internal
 }  // namespace aura_shell
 
 #endif  // UI_AURA_SHELL_WORKSPACE_CONTROLLER_H_