| Index: ash/wm/overview/window_selector_unittest.cc
|
| diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc
|
| index 1900ab713e68e117dc20fdec99119d24f10d1fc5..0bec0e49b0dd58cad6ee0119fd5968534b55bb68 100644
|
| --- a/ash/wm/overview/window_selector_unittest.cc
|
| +++ b/ash/wm/overview/window_selector_unittest.cc
|
| @@ -17,12 +17,12 @@
|
| #include "ash/test/shelf_view_test_api.h"
|
| #include "ash/test/shell_test_api.h"
|
| #include "ash/test/test_app_list_view_presenter_impl.h"
|
| -#include "ash/wm/maximize_mode/maximize_mode_controller.h"
|
| #include "ash/wm/overview/window_grid.h"
|
| #include "ash/wm/overview/window_selector.h"
|
| #include "ash/wm/overview/window_selector_controller.h"
|
| #include "ash/wm/overview/window_selector_item.h"
|
| #include "ash/wm/panels/panel_layout_manager.h"
|
| +#include "ash/wm/tablet_mode/tablet_mode_controller.h"
|
| #include "ash/wm/window_state.h"
|
| #include "ash/wm/window_util.h"
|
| #include "ash/wm/wm_event.h"
|
| @@ -890,12 +890,11 @@
|
| // Tests that entering overview when a fullscreen window is active in maximized
|
| // mode correctly applies the transformations to the window and correctly
|
| // updates the window bounds on exiting overview mode: http://crbug.com/401664.
|
| -TEST_F(WindowSelectorTest, FullscreenWindowMaximizeMode) {
|
| +TEST_F(WindowSelectorTest, FullscreenWindowTabletMode) {
|
| gfx::Rect bounds(0, 0, 400, 400);
|
| std::unique_ptr<aura::Window> window1(CreateWindow(bounds));
|
| std::unique_ptr<aura::Window> window2(CreateWindow(bounds));
|
| - Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
|
| - true);
|
| + Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(true);
|
| wm::ActivateWindow(window2.get());
|
| wm::ActivateWindow(window1.get());
|
| gfx::Rect normal_window_bounds(window1->bounds());
|
|
|