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

ui/aura_shell/default_container_layout_manager_unittest.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/default_container_layout_manager.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/screen_aura.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/workspace/workspace_manager.h"
+#include "ui/aura_shell/workspace/workspace_controller.h"
 #include "ui/base/view_prop.h"
 #include "views/widget/native_widget_aura.h"
 
 namespace aura_shell {
 namespace test {
 
 namespace {
 
 using views::Widget;
 using aura_shell::internal::DefaultContainerLayoutManager;
 
 class DefaultContainerLayoutManagerTest : public aura::test::AuraTestBase {
  public:
   DefaultContainerLayoutManagerTest() {}
   virtual ~DefaultContainerLayoutManagerTest() {}
 
   virtual void SetUp() OVERRIDE {
     aura::test::AuraTestBase::SetUp();
     aura::Desktop* desktop = aura::Desktop::GetInstance();
     container_.reset(
         CreateTestWindow(gfx::Rect(0, 0, 500, 400), desktop));
-    workspace_manager_.reset(new WorkspaceManager(container_.get()));
+    workspace_controller_.reset(
+        new internal::WorkspaceController(container_.get()));
 
     desktop->SetHostSize(gfx::Size(500, 400));
-    default_container_layout_manager_ = new DefaultContainerLayoutManager(
-        container_.get(), workspace_manager_.get());
-    // draggable area is 0,0 500x400.
-    container_->SetLayoutManager(default_container_layout_manager_);
   }
 
   aura::Window* CreateTestWindowWithType(const gfx::Rect& bounds,
                                          aura::Window* parent,
                                          Widget::InitParams::Type type) {
     aura::Window* window = new aura::Window(NULL);
     props_.push_back(new ui::ViewProp(
         window, views::NativeWidgetAura::kWindowTypeKey,
         reinterpret_cast<void*>(type)));
     window->SetType(type);
     window->Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
     window->SetBounds(bounds);
     window->Show();
     window->SetParent(parent);
     return window;
   }
 
   aura::Window* CreateTestWindow(const gfx::Rect& bounds,
                                  aura::Window* parent) {
     return CreateTestWindowWithType(bounds,
                                     parent,
                                     Widget::InitParams::TYPE_WINDOW);
   }
 
   aura::Window* container() { return container_.get(); }
 
   DefaultContainerLayoutManager* default_container_layout_manager() {
-    return default_container_layout_manager_;
+    return workspace_controller_->layout_manager();
   }
 
-
  private:
   scoped_ptr<aura::Window> container_;
   ScopedVector<ui::ViewProp> props_;
-  scoped_ptr<aura_shell::WorkspaceManager> workspace_manager_;
-  DefaultContainerLayoutManager* default_container_layout_manager_;
+  scoped_ptr<aura_shell::internal::WorkspaceController> workspace_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultContainerLayoutManagerTest);
 };
 
 }  // namespace
 
 #if !defined(OS_WIN)
 TEST_F(DefaultContainerLayoutManagerTest, SetBounds) {
   // Layout Manager moves the window to (0,0) to fit to draggable area.
   scoped_ptr<aura::Window> child(
@@ skipping 47 matching lines @@
   popup->SetBounds(gfx::Rect(-100, 0, 100, 100));
   EXPECT_EQ("-100,0 100x100", popup->bounds().ToString());
 
   // A popup window can be resized to the size bigger than draggable area.
   popup->SetBounds(gfx::Rect(0, 0, 1000, 1000));
   EXPECT_EQ("0,0 1000x1000", popup->bounds().ToString());
 }
 
 }  // namespace test
 }  // namespace aura_shell