| Index: ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
|
| diff --git a/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc b/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
|
| index 12f48ad040fdef69b2c20dc895fb2814bfb6ed14..d8b5c6027e74e138afdf6fbdc1a293912f454a0f 100644
|
| --- a/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
|
| +++ b/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "ash/common/ash_layout_constants.h"
|
| #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
|
| +#include "ash/common/wm_shell.h"
|
| #include "ash/frame/caption_buttons/frame_caption_button.h"
|
| #include "ash/shell.h"
|
| #include "ash/test/ash_test_base.h"
|
| @@ -165,9 +166,8 @@ TEST_F(FrameCaptionButtonContainerViewTest,
|
|
|
| // Hidden size button should result in minimize button animating to the
|
| // right. The size button should not be visible, but should not have moved.
|
| - Shell::GetInstance()
|
| - ->maximize_mode_controller()
|
| - ->EnableMaximizeModeWindowManager(true);
|
| + WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
|
| + true);
|
| container.UpdateSizeButtonVisibility();
|
| test.EndAnimations();
|
| // Parent needs to layout in response to size change.
|
| @@ -186,9 +186,8 @@ TEST_F(FrameCaptionButtonContainerViewTest,
|
|
|
| // Revealing the size button should cause the minimize button to return to its
|
| // original position.
|
| - Shell::GetInstance()
|
| - ->maximize_mode_controller()
|
| - ->EnableMaximizeModeWindowManager(false);
|
| + WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
|
| + false);
|
| container.UpdateSizeButtonVisibility();
|
| // Calling code needs to layout in response to size change.
|
| container.Layout();
|
|
|