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

Unified Diff: ash/system/power/tablet_power_button_controller_unittest.cc

Issue 2906803002: Rename MaximizeMode to TabletMode (Closed)
Patch Set: updated filter 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
Index: ash/system/power/tablet_power_button_controller_unittest.cc
diff --git a/ash/system/power/tablet_power_button_controller_unittest.cc b/ash/system/power/tablet_power_button_controller_unittest.cc
index a0bfcda0ff2b6cee8db96218a0b492809c22505a..f3ea4a241edba438d5e40023b8909209f73b0876 100644
--- a/ash/system/power/tablet_power_button_controller_unittest.cc
+++ b/ash/system/power/tablet_power_button_controller_unittest.cc
@@ -16,8 +16,8 @@
#include "ash/test/test_session_controller_client.h"
#include "ash/test/test_shell_delegate.h"
#include "ash/wm/lock_state_controller.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/wm/power_button_controller.h"
+#include "ash/wm/tablet_mode/tablet_mode_controller.h"
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/memory/ptr_util.h"
@@ -112,8 +112,8 @@ class TabletPowerButtonControllerTest : public AshTestBase {
SetUserLoggedIn(status != LoginStatus::NOT_LOGGED_IN);
}
- void EnableMaximizeMode(bool enabled) {
- Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+ void EnableTabletMode(bool enabled) {
+ Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(
enabled);
}
@@ -302,7 +302,7 @@ TEST_F(TabletPowerButtonControllerTest,
// For convertible device working on laptop mode, tests keyboard/mouse event
// when screen is off.
TEST_F(TabletPowerButtonControllerTest, ConvertibleOnLaptopMode) {
- EnableMaximizeMode(false);
+ EnableTabletMode(false);
// KeyEvent should SetBacklightsForcedOff(false).
PressPowerButton();
@@ -335,8 +335,8 @@ TEST_F(TabletPowerButtonControllerTest, ConvertibleOnLaptopMode) {
// For convertible device working on tablet mode, keyboard/mouse event should
// not SetBacklightsForcedOff(false) when screen is off.
-TEST_F(TabletPowerButtonControllerTest, ConvertibleOnMaximizeMode) {
- EnableMaximizeMode(true);
+TEST_F(TabletPowerButtonControllerTest, ConvertibleOnTabletMode) {
+ EnableTabletMode(true);
PressPowerButton();
ReleasePowerButton();
@@ -389,7 +389,7 @@ TEST_F(TabletPowerButtonControllerTest, TouchscreenState) {
ReleasePowerButton();
EXPECT_TRUE(shell_delegate_->IsTouchscreenEnabledInPrefs(true));
- EnableMaximizeMode(false);
+ EnableTabletMode(false);
// KeyEvent on laptop mode when screen is off.
PressPowerButton();
ReleasePowerButton();
@@ -414,14 +414,14 @@ TEST_F(TabletPowerButtonControllerTest, TouchscreenState) {
// When user switches convertible device between laptop mode and tablet mode,
// power button may be pressed and held, which may cause unwanted shutdown.
TEST_F(TabletPowerButtonControllerTest,
- EnterOrLeaveMaximizeModeWhilePressingPowerButton) {
+ EnterOrLeaveTabletModeWhilePressingPowerButton) {
Initialize(LoginStatus::USER);
SetShouldLockScreenAutomatically(true);
ASSERT_FALSE(GetLockedState());
power_manager_client_->SendPowerButtonEvent(true, tick_clock_->NowTicks());
EXPECT_TRUE(test_api_->ShutdownTimerIsRunning());
- tablet_controller_->OnMaximizeModeStarted();
+ tablet_controller_->OnTabletModeStarted();
EXPECT_FALSE(test_api_->ShutdownTimerIsRunning());
tick_clock_->Advance(base::TimeDelta::FromMilliseconds(1500));
power_manager_client_->SendPowerButtonEvent(false, tick_clock_->NowTicks());
@@ -431,7 +431,7 @@ TEST_F(TabletPowerButtonControllerTest,
power_manager_client_->SendPowerButtonEvent(true, tick_clock_->NowTicks());
test_api_->TriggerShutdownTimeout();
EXPECT_TRUE(lock_state_test_api_->shutdown_timer_is_running());
- tablet_controller_->OnMaximizeModeStarted();
+ tablet_controller_->OnTabletModeStarted();
EXPECT_FALSE(lock_state_test_api_->shutdown_timer_is_running());
tick_clock_->Advance(base::TimeDelta::FromMilliseconds(2500));
power_manager_client_->SendPowerButtonEvent(false, tick_clock_->NowTicks());
@@ -440,7 +440,7 @@ TEST_F(TabletPowerButtonControllerTest,
power_manager_client_->SendPowerButtonEvent(true, tick_clock_->NowTicks());
EXPECT_TRUE(test_api_->ShutdownTimerIsRunning());
- tablet_controller_->OnMaximizeModeEnded();
+ tablet_controller_->OnTabletModeEnded();
EXPECT_FALSE(test_api_->ShutdownTimerIsRunning());
tick_clock_->Advance(base::TimeDelta::FromMilliseconds(3500));
power_manager_client_->SendPowerButtonEvent(false, tick_clock_->NowTicks());
@@ -450,7 +450,7 @@ TEST_F(TabletPowerButtonControllerTest,
power_manager_client_->SendPowerButtonEvent(true, tick_clock_->NowTicks());
test_api_->TriggerShutdownTimeout();
EXPECT_TRUE(lock_state_test_api_->shutdown_timer_is_running());
- tablet_controller_->OnMaximizeModeEnded();
+ tablet_controller_->OnTabletModeEnded();
EXPECT_FALSE(lock_state_test_api_->shutdown_timer_is_running());
tick_clock_->Advance(base::TimeDelta::FromMilliseconds(4500));
power_manager_client_->SendPowerButtonEvent(false, tick_clock_->NowTicks());

Powered by Google App Engine
This is Rietveld 408576698