| Index: ash/wm/panels/panel_window_resizer_unittest.cc
|
| diff --git a/ash/wm/panels/panel_window_resizer_unittest.cc b/ash/wm/panels/panel_window_resizer_unittest.cc
|
| index 754ef3743d49d8e950ebc3ba921ab65003b2b702..bbc59e9977c9494be30a5fe97168ef16545cde5f 100644
|
| --- a/ash/wm/panels/panel_window_resizer_unittest.cc
|
| +++ b/ash/wm/panels/panel_window_resizer_unittest.cc
|
| @@ -240,7 +240,8 @@ TEST_F(PanelWindowResizerTest, PanelDetachReattachLeft) {
|
| return;
|
|
|
| ash::Shell* shell = ash::Shell::GetInstance();
|
| - shell->SetShelfAlignment(SHELF_ALIGNMENT_LEFT, shell->GetPrimaryRootWindow());
|
| + shell->SetShelfAlignment(wm::SHELF_ALIGNMENT_LEFT,
|
| + shell->GetPrimaryRootWindow());
|
| std::unique_ptr<aura::Window> window(CreatePanelWindow(gfx::Point(0, 0)));
|
| DetachReattachTest(window.get(), 1, 0);
|
| }
|
| @@ -250,7 +251,7 @@ TEST_F(PanelWindowResizerTest, PanelDetachReattachRight) {
|
| return;
|
|
|
| ash::Shell* shell = ash::Shell::GetInstance();
|
| - shell->SetShelfAlignment(SHELF_ALIGNMENT_RIGHT,
|
| + shell->SetShelfAlignment(wm::SHELF_ALIGNMENT_RIGHT,
|
| shell->GetPrimaryRootWindow());
|
| std::unique_ptr<aura::Window> window(CreatePanelWindow(gfx::Point(0, 0)));
|
| DetachReattachTest(window.get(), -1, 0);
|
| @@ -493,7 +494,8 @@ TEST_F(PanelWindowResizerTest, DragReordersPanelsVertical) {
|
| return;
|
|
|
| ash::Shell* shell = ash::Shell::GetInstance();
|
| - shell->SetShelfAlignment(SHELF_ALIGNMENT_LEFT, shell->GetPrimaryRootWindow());
|
| + shell->SetShelfAlignment(wm::SHELF_ALIGNMENT_LEFT,
|
| + shell->GetPrimaryRootWindow());
|
| DragAlongShelfReorder(0, -1);
|
| }
|
|
|
|
|