| Index: ash/root_window_controller_unittest.cc
|
| diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
|
| index 6aef751f5762b6a55e4c28f593ed6910206cff66..55f076341903e3a97a1aa9b9c2af74636138798a 100644
|
| --- a/ash/root_window_controller_unittest.cc
|
| +++ b/ash/root_window_controller_unittest.cc
|
| @@ -5,6 +5,7 @@
|
| #include "ash/root_window_controller.h"
|
|
|
| #include "ash/display/display_controller.h"
|
| +#include "ash/shelf/shelf_layout_manager.h"
|
| #include "ash/shell.h"
|
| #include "ash/shell_delegate.h"
|
| #include "ash/shell_window_ids.h"
|
| @@ -129,7 +130,10 @@ TEST_F(RootWindowControllerTest, MAYBE_MoveWindows_Basic) {
|
| Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
|
| internal::RootWindowController* controller =
|
| Shell::GetPrimaryRootWindowController();
|
| - controller->SetShelfAutoHideBehavior(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
|
| + internal::ShelfLayoutManager* shelf_layout_manager =
|
| + controller->GetShelfLayoutManager();
|
| + shelf_layout_manager->SetAutoHideBehavior(
|
| + ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
|
|
|
| views::Widget* normal = CreateTestWidget(gfx::Rect(650, 10, 100, 100));
|
| EXPECT_EQ(root_windows[1], normal->GetNativeView()->GetRootWindow());
|
|
|