Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(700)

Unified Diff: ash/wm/lock_state_controller_unittest.cc

Issue 2909763002: Revert of Rename MaximizeMode to TabletMode (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/virtual_keyboard_controller_unittest.cc ('k') | ash/wm/maximize_mode/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 88495b2bfdb10c18183b9fe351ad6289eb28bf6d..e21111589428907d9371055a5ca9ad9c9bb8b39c 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 EnableTabletMode(bool enable) {
- Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(
+ void EnableMaximizeMode(bool enable) {
+ Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
enable);
}
@@ -1035,9 +1035,9 @@
test::TestScreenshotDelegate* delegate = GetScreenshotDelegate();
delegate->set_can_take_screenshot(true);
- EnableTabletMode(false);
-
- // Screenshot handling should not be active when not in tablet mode.
+ EnableMaximizeMode(false);
+
+ // Screenshot handling should not be active when not in maximize mode.
ASSERT_EQ(0, delegate->handle_take_screenshot_count());
PressVolumeDown();
PressPowerButton();
@@ -1045,7 +1045,7 @@
ReleaseVolumeDown();
EXPECT_EQ(0, delegate->handle_take_screenshot_count());
- EnableTabletMode(true);
+ EnableMaximizeMode(true);
// Pressing power alone does not take a screenshot.
PressPowerButton();
« no previous file with comments | « ash/virtual_keyboard_controller_unittest.cc ('k') | ash/wm/maximize_mode/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698