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

Unified Diff: ash/system/chromeos/rotation/tray_rotation_lock.cc

Issue 308683002: Move MaximizeModeWindowManager to the controller (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 6 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/chromeos/rotation/tray_rotation_lock.cc
diff --git a/ash/system/chromeos/rotation/tray_rotation_lock.cc b/ash/system/chromeos/rotation/tray_rotation_lock.cc
index 293299ad20a1a41107f35bd1bca5b13eaeef9563..a2283a7abfe7e8ee340cf1b02d7eb60f48ad5520 100644
--- a/ash/system/chromeos/rotation/tray_rotation_lock.cc
+++ b/ash/system/chromeos/rotation/tray_rotation_lock.cc
@@ -44,7 +44,8 @@ class RotationLockDefaultView : public TrayItemMore,
RotationLockDefaultView::RotationLockDefaultView(SystemTrayItem* owner)
: TrayItemMore(owner, false) {
UpdateImage();
- SetVisible(Shell::GetInstance()->IsMaximizeModeWindowManagerEnabled());
+ SetVisible(Shell::GetInstance()->maximize_mode_controller()->
+ IsMaximizeModeWindowManagerEnabled());
Shell::GetInstance()->AddShellObserver(this);
}
@@ -131,9 +132,11 @@ void TrayRotationLock::OnMaximizeModeEnded() {
}
bool TrayRotationLock::GetInitialVisibility() {
+ MaximizeModeController* controller = Shell::GetInstance()->
+ maximize_mode_controller();
return on_primary_display_ &&
- Shell::GetInstance()->IsMaximizeModeWindowManagerEnabled() &&
- Shell::GetInstance()->maximize_mode_controller()->rotation_locked();
+ controller->IsMaximizeModeWindowManagerEnabled() &&
+ controller->rotation_locked();
}
} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698