| 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 984ef6c2ebc8748a54a38df4292eb2ebd6b10e0b..fbf55ec6aeaffd82a278de21a9e8dc25c72f3070 100644
|
| --- a/ash/wm/shelf_layout_manager_unittest.cc
|
| +++ b/ash/wm/shelf_layout_manager_unittest.cc
|
| @@ -170,7 +170,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);
|
| + AddToRootWindow(window);
|
| return window;
|
| }
|
|
|
|
|