| Index: ash/wm/workspace/workspace_window_resizer_unittest.cc
|
| diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc
|
| index 599c4ea98e88ae314d7e5a73b75e1f4d1593c515..16a45fc5c24405092c9302e89d70a2ba3e11583a 100644
|
| --- a/ash/wm/workspace/workspace_window_resizer_unittest.cc
|
| +++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc
|
| @@ -119,25 +119,25 @@ class WorkspaceWindowResizerTest : public test::AshTestBase {
|
| EXPECT_EQ(800, root_bounds.width());
|
| Shell::GetInstance()->SetDisplayWorkAreaInsets(root, gfx::Insets());
|
| window_.reset(new aura::Window(&delegate_));
|
| - window_->SetType(aura::client::WINDOW_TYPE_NORMAL);
|
| + window_->SetType(ui::wm::WINDOW_TYPE_NORMAL);
|
| window_->Init(ui::LAYER_NOT_DRAWN);
|
| ParentWindowInPrimaryRootWindow(window_.get());
|
| window_->set_id(1);
|
|
|
| window2_.reset(new aura::Window(&delegate2_));
|
| - window2_->SetType(aura::client::WINDOW_TYPE_NORMAL);
|
| + window2_->SetType(ui::wm::WINDOW_TYPE_NORMAL);
|
| window2_->Init(ui::LAYER_NOT_DRAWN);
|
| ParentWindowInPrimaryRootWindow(window2_.get());
|
| window2_->set_id(2);
|
|
|
| window3_.reset(new aura::Window(&delegate3_));
|
| - window3_->SetType(aura::client::WINDOW_TYPE_NORMAL);
|
| + window3_->SetType(ui::wm::WINDOW_TYPE_NORMAL);
|
| window3_->Init(ui::LAYER_NOT_DRAWN);
|
| ParentWindowInPrimaryRootWindow(window3_.get());
|
| window3_->set_id(3);
|
|
|
| window4_.reset(new aura::Window(&delegate4_));
|
| - window4_->SetType(aura::client::WINDOW_TYPE_NORMAL);
|
| + window4_->SetType(ui::wm::WINDOW_TYPE_NORMAL);
|
| window4_->Init(ui::LAYER_NOT_DRAWN);
|
| ParentWindowInPrimaryRootWindow(window4_.get());
|
| window4_->set_id(4);
|
|
|