Index: ash/wm/lock_state_controller_unittest.cc |
diff --git a/ash/wm/lock_state_controller_unittest.cc b/ash/wm/lock_state_controller_unittest.cc |
index e21111589428907d9371055a5ca9ad9c9bb8b39c..88495b2bfdb10c18183b9fe351ad6289eb28bf6d 100644 |
--- a/ash/wm/lock_state_controller_unittest.cc |
+++ b/ash/wm/lock_state_controller_unittest.cc |
@@ -17,9 +17,9 @@ |
#include "ash/test/test_session_controller_client.h" |
#include "ash/test/test_session_state_animator.h" |
#include "ash/test/test_shell_delegate.h" |
-#include "ash/wm/maximize_mode/maximize_mode_controller.h" |
#include "ash/wm/power_button_controller.h" |
#include "ash/wm/session_state_animator.h" |
+#include "ash/wm/tablet_mode/tablet_mode_controller.h" |
#include "base/memory/ptr_util.h" |
#include "base/memory/scoped_vector.h" |
#include "base/time/time.h" |
@@ -327,8 +327,8 @@ |
GetSessionControllerClient()->UnlockScreen(); |
} |
- void EnableMaximizeMode(bool enable) { |
- Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager( |
+ void EnableTabletMode(bool enable) { |
+ Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager( |
enable); |
} |
@@ -1035,9 +1035,9 @@ |
test::TestScreenshotDelegate* delegate = GetScreenshotDelegate(); |
delegate->set_can_take_screenshot(true); |
- EnableMaximizeMode(false); |
- |
- // Screenshot handling should not be active when not in maximize mode. |
+ EnableTabletMode(false); |
+ |
+ // Screenshot handling should not be active when not in tablet mode. |
ASSERT_EQ(0, delegate->handle_take_screenshot_count()); |
PressVolumeDown(); |
PressPowerButton(); |
@@ -1045,7 +1045,7 @@ |
ReleaseVolumeDown(); |
EXPECT_EQ(0, delegate->handle_take_screenshot_count()); |
- EnableMaximizeMode(true); |
+ EnableTabletMode(true); |
// Pressing power alone does not take a screenshot. |
PressPowerButton(); |