| Index: ash/wm/shelf_layout_manager_unittest.cc
|
| diff --git a/ash/wm/shelf_layout_manager_unittest.cc b/ash/wm/shelf_layout_manager_unittest.cc
|
| index 2c031d9b4c9f5d327ba70df040219c0c9bed18ac..3e8f4b7d3516ca45cae7271613cf883dcbf115fe 100644
|
| --- a/ash/wm/shelf_layout_manager_unittest.cc
|
| +++ b/ash/wm/shelf_layout_manager_unittest.cc
|
| @@ -171,7 +171,7 @@ class ShelfLayoutManagerTest : public ash::test::AshTestBase {
|
| window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
|
| window->SetType(aura::client::WINDOW_TYPE_NORMAL);
|
| window->Init(ui::LAYER_TEXTURED);
|
| - window->SetParent(NULL);
|
| + SetDefaultParentByPrimaryRootWindow(window);
|
| return window;
|
| }
|
|
|
|
|