Add workspace to desktop

ui/aura_shell/workspace/workspace_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/workspace/workspace_manager.h"
 #include "ui/aura_shell/workspace/workspace.h"
 
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/window.h"
 
@@ skipping 12 matching lines @@
 
 namespace aura_shell {
 
 using aura::Window;
 using aura_shell::Workspace;
 
 class WorkspaceManagerTest : public WorkspaceManagerTestBase {
 };
 
 TEST_F(WorkspaceManagerTest, WorkspaceManagerBaic) {
-  WorkspaceManager manager;
+  scoped_ptr<aura::Window> viewport(CreateTestWindow());
+  WorkspaceManager manager(viewport.get());
   scoped_ptr<Window> w1(CreateTestWindow());
   scoped_ptr<Window> w2(CreateTestWindow());
 
   Workspace* ws1 = manager.CreateWorkspace();
   ws1->AddWindowAfter(w1.get(), NULL);
   // w2 is not a part of any workspace yet.
   EXPECT_EQ(NULL, manager.FindBy(w2.get()));
 
   // w2 is in ws2 workspace.
   Workspace* ws2 = manager.CreateWorkspace();
   ws2->AddWindowAfter(w2.get(), NULL);
   EXPECT_EQ(ws2, manager.FindBy(w2.get()));
 
   // Make sure |FindBy(w1.get())| still returns
   // correct workspace.
   EXPECT_EQ(ws1, manager.FindBy(w1.get()));
 
   // once workspace is gone, w2 shouldn't match
   // any workspace.
   delete ws2;
   EXPECT_EQ(NULL, manager.FindBy(w2.get()));
 }
 
 TEST_F(WorkspaceManagerTest, WorkspaceManagerLayout) {
-  WorkspaceManager manager;
+  scoped_ptr<aura::Window> viewport(CreateTestWindow());
+  WorkspaceManager manager(viewport.get());
   manager.set_workspace_size(gfx::Size(100, 100));
   EXPECT_EQ(0, manager.GetTotalWidth());
 
   Workspace* ws1 = manager.CreateWorkspace();
   manager.Layout();
+
   // ws1 is laied out in left most position.
   EXPECT_EQ(100, manager.GetTotalWidth());
   EXPECT_EQ("0,0 100x100", ws1->bounds().ToString());
 
   // ws2 is laied out next to ws1, with 50 margin.
   Workspace* ws2 = manager.CreateWorkspace();
   manager.Layout();
+
   EXPECT_EQ(250, manager.GetTotalWidth());
   EXPECT_EQ("0,0 100x100", ws1->bounds().ToString());
   EXPECT_EQ("150,0 100x100", ws2->bounds().ToString());
 }
 
 TEST_F(WorkspaceManagerTest, WorkspaceManagerActivate) {
   WorkspaceManager manager;
   Workspace* ws1 = manager.CreateWorkspace();
   Workspace* ws2 = manager.CreateWorkspace();
   EXPECT_EQ(NULL, manager.GetActiveWorkspace());
 
   // Activate ws1.
   ws1->Activate();
   EXPECT_EQ(ws1, manager.GetActiveWorkspace());
 
   // Activate ws2.
   ws2->Activate();
   EXPECT_EQ(ws2, manager.GetActiveWorkspace());
 
   // Deleting active workspace sets active workspace to NULL.
   delete ws2;
   EXPECT_EQ(NULL, manager.GetActiveWorkspace());
 }
 
 class WorkspaceTest : public WorkspaceManagerTestBase {
 };
 
 TEST_F(WorkspaceTest, WorkspaceBasic) {
-  WorkspaceManager manager;
+  scoped_ptr<aura::Window> viewport(CreateTestWindow());
+  WorkspaceManager manager(viewport.get());
 
   Workspace* ws = manager.CreateWorkspace();
   // Sanity check
   EXPECT_TRUE(ws->is_empty());
 
   scoped_ptr<Window> w1(CreateTestWindow());
   scoped_ptr<Window> w2(CreateTestWindow());
   scoped_ptr<Window> w3(CreateTestWindow());
   w1->Init();
   w2->Init();
@@ skipping 27 matching lines @@
   EXPECT_EQ(0, ws->GetIndexOf(w2.get()));
   EXPECT_FALSE(ws->Contains(w1.get()));
 
   // Add w1 back. w1 now has index = 1.
   EXPECT_TRUE(ws->AddWindowAfter(w1.get(), w2.get()));
   EXPECT_EQ(0, ws->GetIndexOf(w2.get()));
   EXPECT_EQ(1, ws->GetIndexOf(w1.get()));
 }
 
 }  // namespace aura_shell