| Index: ui/aura_shell/workspace/workspace_manager_unittest.cc
|
| diff --git a/ui/aura_shell/workspace/workspace_manager_unittest.cc b/ui/aura_shell/workspace/workspace_manager_unittest.cc
|
| index e7ea6f2e07d896b2f35b03aef83eb8bec425f9e4..07164a03eca78c2a90ff04864a89fa9a307e70a6 100644
|
| --- a/ui/aura_shell/workspace/workspace_manager_unittest.cc
|
| +++ b/ui/aura_shell/workspace/workspace_manager_unittest.cc
|
| @@ -30,7 +30,8 @@ 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());
|
|
|
| @@ -55,12 +56,14 @@ TEST_F(WorkspaceManagerTest, WorkspaceManagerBaic) {
|
| }
|
|
|
| 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());
|
| @@ -68,6 +71,7 @@ TEST_F(WorkspaceManagerTest, WorkspaceManagerLayout) {
|
| // 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());
|
| @@ -96,7 +100,8 @@ 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
|
|
|