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

Unified Diff: ash/common/system/overview/overview_button_tray.cc

Issue 2766543002: Move even more from WmShell to Shell (Closed)
Patch Set: Created 3 years, 9 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/common/system/overview/overview_button_tray.cc
diff --git a/ash/common/system/overview/overview_button_tray.cc b/ash/common/system/overview/overview_button_tray.cc
index c580d1da330608c5db4f41d05590358cd3ae42c7..a323d40641233f14e999f035ba02a5ee0046005c 100644
--- a/ash/common/system/overview/overview_button_tray.cc
+++ b/ash/common/system/overview/overview_button_tray.cc
@@ -109,18 +109,18 @@ void OverviewButtonTray::UpdateIconVisibility() {
// WindowSelectorController::CanSelect. The visibility of the button should
// not change during transient times in which CanSelect is false. Such as when
// a modal dialog is present.
- WmShell* shell = WmShell::Get();
- SessionController* session_controller = shell->session_controller();
+ SessionController* session_controller = WmShell::Get()->session_controller();
+ Shell* shell = Shell::Get();
SetVisible(
shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() &&
session_controller->IsActiveUserSessionStarted() &&
!session_controller->IsScreenLocked() &&
session_controller->GetSessionState() ==
session_manager::SessionState::ACTIVE &&
- Shell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
+ shell->system_tray_delegate()->GetUserLoginStatus() !=
LoginStatus::KIOSK_APP &&
- Shell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
+ shell->system_tray_delegate()->GetUserLoginStatus() !=
LoginStatus::ARC_KIOSK_APP);
}

Powered by Google App Engine
This is Rietveld 408576698