Fixes bug where windows weren't being moved and resized if the desktop

ui/aura_shell/shell.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_SHELL_H_
 #define UI_AURA_SHELL_SHELL_H_
 #pragma once
 
 #include <utility>
 #include <vector>
@@ skipping 10 matching lines @@
 class Window;
 }
 namespace gfx {
 class Rect;
 }
 
 namespace aura_shell {
 
 class Launcher;
 class ShellDelegate;
-class WorkspaceManager;
+
+namespace internal {
+class WorkspaceController;
+}
 
 // Shell is a singleton object that presents the Shell API and implements the
 // Desktop's delegate interface.
 class AURA_SHELL_EXPORT Shell : public aura::DesktopDelegate {
  public:
   // Upon creation, the Shell sets itself as the Desktop's delegate, which takes
   // ownership of the Shell.
   Shell();
   virtual ~Shell();
 
@@ skipping 24 matching lines @@
   static Shell* instance_;
 
   std::vector<WindowAndBoundsPair> to_restore_;
 
   base::WeakPtrFactory<Shell> method_factory_;
 
   scoped_ptr<ShellDelegate> delegate_;
 
   scoped_ptr<Launcher> launcher_;
 
-  scoped_ptr<WorkspaceManager> workspace_manager_;
+  scoped_ptr<internal::WorkspaceController> workspace_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace aura_shell
 
 #endif  // UI_AURA_SHELL_SHELL_H_