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

ui/aura_shell/shell.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/shell.h"
 
 #include "base/bind.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/screen_aura.h"
 #include "ui/aura/toplevel_window_container.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_types.h"
 #include "ui/aura_shell/default_container_event_filter.h"
-#include "ui/aura_shell/default_container_layout_manager.h"
 #include "ui/aura_shell/desktop_layout_manager.h"
 #include "ui/aura_shell/launcher/launcher.h"
 #include "ui/aura_shell/shell_delegate.h"
 #include "ui/aura_shell/shell_factory.h"
 #include "ui/aura_shell/shell_window_ids.h"
-#include "ui/aura_shell/workspace/workspace_manager.h"
+#include "ui/aura_shell/workspace/workspace_controller.h"
 #include "ui/base/view_prop.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
 #include "views/widget/native_widget_aura.h"
 #include "views/widget/widget.h"
 
 namespace aura_shell {
 
 namespace {
 
@@ skipping 89 matching lines @@
   launcher_.reset(new Launcher(toplevel_container));
   desktop_layout->set_launcher_widget(launcher_->widget());
   desktop_layout->set_status_area_widget(internal::CreateStatusArea());
 
   desktop_window->screen()->set_work_area_insets(
       gfx::Insets(
           0, kWorkAreaHorizontalMargin,
           launcher_->widget()->GetWindowScreenBounds().height(),
           kWorkAreaHorizontalMargin));
 
-  // Workspace Manager
-  workspace_manager_.reset(new WorkspaceManager(toplevel_container));
-  toplevel_container->SetLayoutManager(
-      new internal::DefaultContainerLayoutManager(
-          toplevel_container, workspace_manager_.get()));
+  workspace_controller_.reset(
+      new internal::WorkspaceController(toplevel_container));
 
   // Force a layout.
   desktop_layout->OnWindowResized();
 }
 
 void Shell::SetDelegate(ShellDelegate* delegate) {
   delegate_.reset(delegate);
 }
 
 aura::Window* Shell::GetContainer(int container_id) {
   return const_cast<aura::Window*>(
       const_cast<const aura_shell::Shell*>(this)->GetContainer(container_id));
 }
 
 const aura::Window* Shell::GetContainer(int container_id) const {
   return aura::Desktop::GetInstance()->GetChildById(container_id);
 }
 
 void Shell::ToggleOverview() {
-  workspace_manager_->SetOverview(!workspace_manager_->is_overview());
+  workspace_controller_->ToggleOverview();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, aura::DesktopDelegate implementation:
 
 void Shell::AddChildToDefaultParent(aura::Window* window) {
   aura::Window* parent = NULL;
   intptr_t type = reinterpret_cast<intptr_t>(
       ui::ViewProp::GetValue(window, views::NativeWidgetAura::kWindowTypeKey));
   switch (static_cast<Widget::InitParams::Type>(type)) {
@@ skipping 16 matching lines @@
 }
 
 aura::Window* Shell::GetTopmostWindowToActivate(aura::Window* ignore) const {
   const aura::ToplevelWindowContainer* container =
       GetContainer(internal::kShellWindowId_DefaultContainer)->
           AsToplevelWindowContainer();
   return container->GetTopmostWindowToActivate(ignore);
 }
 
 }  // namespace aura_shell