| Index: ash/wm/dock/docked_window_layout_manager_unittest.cc
|
| diff --git a/ash/wm/dock/docked_window_layout_manager_unittest.cc b/ash/wm/dock/docked_window_layout_manager_unittest.cc
|
| index 6251015f01aa4c8a0c5cfd16d6ee654875f2b7f5..397b0f591957196a663c62abcea62a8557760792 100644
|
| --- a/ash/wm/dock/docked_window_layout_manager_unittest.cc
|
| +++ b/ash/wm/dock/docked_window_layout_manager_unittest.cc
|
| @@ -5,6 +5,7 @@
|
| #include "ash/wm/dock/docked_window_layout_manager.h"
|
|
|
| #include "ash/ash_switches.h"
|
| +#include "ash/display/display_manager.h"
|
| #include "ash/root_window_controller.h"
|
| #include "ash/shelf/shelf.h"
|
| #include "ash/shelf/shelf_layout_manager.h"
|
| @@ -77,8 +78,7 @@ class DockedWindowLayoutManagerTest
|
| test::TestShelfDelegate::instance();
|
| shelf_delegate->AddShelfItem(window);
|
| PanelLayoutManager* manager =
|
| - static_cast<PanelLayoutManager*>(GetPanelContainer(window)->
|
| - layout_manager());
|
| + PanelLayoutManager::Get(wm::WmWindowAura::Get(window));
|
| manager->Relayout();
|
| }
|
| return window;
|
| @@ -94,18 +94,12 @@ class DockedWindowLayoutManagerTest
|
| test::TestShelfDelegate::instance();
|
| shelf_delegate->AddShelfItem(window);
|
| PanelLayoutManager* manager =
|
| - static_cast<PanelLayoutManager*>(GetPanelContainer(window)->
|
| - layout_manager());
|
| + PanelLayoutManager::Get(wm::WmWindowAura::Get(window));
|
| manager->Relayout();
|
| }
|
| return window;
|
| }
|
|
|
| - aura::Window* GetPanelContainer(aura::Window* panel) {
|
| - return Shell::GetContainer(panel->GetRootWindow(),
|
| - kShellWindowId_PanelContainer);
|
| - }
|
| -
|
| static WindowResizer* CreateSomeWindowResizer(
|
| aura::Window* window,
|
| const gfx::Point& point_in_parent,
|
|
|