| Index: ash/system/rotation/tray_rotation_lock.cc
|
| diff --git a/ash/system/rotation/tray_rotation_lock.cc b/ash/system/rotation/tray_rotation_lock.cc
|
| index 1c6a3e6c4b075e23c3002c5b048ba76f4a2b3a8a..e3254f30a6f090386b0cec7c846317cf7f360e9f 100644
|
| --- a/ash/system/rotation/tray_rotation_lock.cc
|
| +++ b/ash/system/rotation/tray_rotation_lock.cc
|
| @@ -15,7 +15,7 @@
|
| #include "ash/system/tray/tray_popup_item_style.h"
|
| #include "ash/system/tray/tray_popup_utils.h"
|
| #include "ash/system/tray/tri_view.h"
|
| -#include "ash/wm/maximize_mode/maximize_mode_controller.h"
|
| +#include "ash/wm/tablet_mode/tablet_mode_controller.h"
|
| #include "ui/accessibility/ax_node_data.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/display/display.h"
|
| @@ -29,10 +29,10 @@ namespace ash {
|
|
|
| namespace {
|
|
|
| -bool IsMaximizeModeWindowManagerEnabled() {
|
| +bool IsTabletModeWindowManagerEnabled() {
|
| return Shell::Get()
|
| - ->maximize_mode_controller()
|
| - ->IsMaximizeModeWindowManagerEnabled();
|
| + ->tablet_mode_controller()
|
| + ->IsTabletModeWindowManagerEnabled();
|
| }
|
|
|
| bool IsUserRotationLocked() {
|
| @@ -71,8 +71,8 @@ class RotationLockDefaultView : public ActionableView,
|
| bool PerformAction(const ui::Event& event) override;
|
|
|
| // ShellObserver:
|
| - void OnMaximizeModeStarted() override;
|
| - void OnMaximizeModeEnded() override;
|
| + void OnTabletModeStarted() override;
|
| + void OnTabletModeEnded() override;
|
|
|
| // ScreenOrientationController::Obsever:
|
| void OnUserRotationLockChanged() override;
|
| @@ -100,9 +100,9 @@ RotationLockDefaultView::RotationLockDefaultView(SystemTrayItem* owner)
|
|
|
| SetInkDropMode(InkDropHostView::InkDropMode::ON);
|
|
|
| - SetVisible(IsMaximizeModeWindowManagerEnabled());
|
| + SetVisible(IsTabletModeWindowManagerEnabled());
|
| Shell::Get()->AddShellObserver(this);
|
| - if (IsMaximizeModeWindowManagerEnabled())
|
| + if (IsTabletModeWindowManagerEnabled())
|
| Shell::Get()->screen_orientation_controller()->AddObserver(this);
|
| }
|
|
|
| @@ -153,13 +153,13 @@ bool RotationLockDefaultView::PerformAction(const ui::Event& event) {
|
| return true;
|
| }
|
|
|
| -void RotationLockDefaultView::OnMaximizeModeStarted() {
|
| +void RotationLockDefaultView::OnTabletModeStarted() {
|
| Update();
|
| SetVisible(true);
|
| Shell::Get()->screen_orientation_controller()->AddObserver(this);
|
| }
|
|
|
| -void RotationLockDefaultView::OnMaximizeModeEnded() {
|
| +void RotationLockDefaultView::OnTabletModeEnded() {
|
| SetVisible(false);
|
| StopObservingRotation();
|
| }
|
| @@ -191,13 +191,13 @@ views::View* TrayRotationLock::CreateDefaultView(LoginStatus status) {
|
| return nullptr;
|
| }
|
|
|
| -void TrayRotationLock::OnMaximizeModeStarted() {
|
| +void TrayRotationLock::OnTabletModeStarted() {
|
| tray_view()->SetVisible(ShouldBeVisible());
|
| UpdateTrayImage();
|
| Shell::Get()->screen_orientation_controller()->AddObserver(this);
|
| }
|
|
|
| -void TrayRotationLock::OnMaximizeModeEnded() {
|
| +void TrayRotationLock::OnTabletModeEnded() {
|
| tray_view()->SetVisible(false);
|
| StopObservingRotation();
|
| }
|
| @@ -219,7 +219,7 @@ void TrayRotationLock::UpdateTrayImage() {
|
| }
|
|
|
| bool TrayRotationLock::ShouldBeVisible() {
|
| - return OnPrimaryDisplay() && IsMaximizeModeWindowManagerEnabled();
|
| + return OnPrimaryDisplay() && IsTabletModeWindowManagerEnabled();
|
| }
|
|
|
| bool TrayRotationLock::OnPrimaryDisplay() const {
|
|
|