| Index: ash/system/power/tablet_power_button_controller.cc
|
| diff --git a/ash/system/power/tablet_power_button_controller.cc b/ash/system/power/tablet_power_button_controller.cc
|
| index b4ed4f18f6f357c189653782b1c4e18e43888c92..00f402e4ccbe193d983cf163395648708aa20f54 100644
|
| --- a/ash/system/power/tablet_power_button_controller.cc
|
| +++ b/ash/system/power/tablet_power_button_controller.cc
|
| @@ -9,7 +9,7 @@
|
| #include "ash/shell.h"
|
| #include "ash/shell_delegate.h"
|
| #include "ash/wm/lock_state_controller.h"
|
| -#include "ash/wm/maximize_mode/maximize_mode_controller.h"
|
| +#include "ash/wm/tablet_mode/tablet_mode_controller.h"
|
| #include "base/time/default_tick_clock.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| #include "ui/events/devices/input_device_manager.h"
|
| @@ -41,18 +41,17 @@ constexpr int kIgnoreRepeatedButtonUpMs = 500;
|
|
|
| // Returns true if device is a convertible/tablet device, otherwise false.
|
| bool IsTabletModeSupported() {
|
| - MaximizeModeController* maximize_mode_controller =
|
| - Shell::Get()->maximize_mode_controller();
|
| - return maximize_mode_controller &&
|
| - maximize_mode_controller->CanEnterMaximizeMode();
|
| + TabletModeController* tablet_mode_controller =
|
| + Shell::Get()->tablet_mode_controller();
|
| + return tablet_mode_controller && tablet_mode_controller->CanEnterTabletMode();
|
| }
|
|
|
| -// Returns true if device is currently in tablet/maximize mode, otherwise false.
|
| +// Returns true if device is currently in tablet/tablet mode, otherwise false.
|
| bool IsTabletModeActive() {
|
| - MaximizeModeController* maximize_mode_controller =
|
| - Shell::Get()->maximize_mode_controller();
|
| - return maximize_mode_controller &&
|
| - maximize_mode_controller->IsMaximizeModeWindowManagerEnabled();
|
| + TabletModeController* tablet_mode_controller =
|
| + Shell::Get()->tablet_mode_controller();
|
| + return tablet_mode_controller &&
|
| + tablet_mode_controller->IsTabletModeWindowManagerEnabled();
|
| }
|
|
|
| } // namespace
|
| @@ -167,13 +166,13 @@ void TabletPowerButtonController::LidEventReceived(
|
| SetDisplayForcedOff(false);
|
| }
|
|
|
| -void TabletPowerButtonController::OnMaximizeModeStarted() {
|
| +void TabletPowerButtonController::OnTabletModeStarted() {
|
| shutdown_timer_.Stop();
|
| if (controller_->CanCancelShutdownAnimation())
|
| controller_->CancelShutdownAnimation();
|
| }
|
|
|
| -void TabletPowerButtonController::OnMaximizeModeEnded() {
|
| +void TabletPowerButtonController::OnTabletModeEnded() {
|
| shutdown_timer_.Stop();
|
| if (controller_->CanCancelShutdownAnimation())
|
| controller_->CancelShutdownAnimation();
|
|
|