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

Unified Diff: ash/wm/maximize_mode/maximize_mode_event_handler.cc

Issue 2864663002: cros: Merge SystemTrayDelegate::GetUserLoginStatus (Closed)
Patch Set: 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/wm/maximize_mode/maximize_mode_event_handler.cc
diff --git a/ash/wm/maximize_mode/maximize_mode_event_handler.cc b/ash/wm/maximize_mode/maximize_mode_event_handler.cc
index 7f93103845f10703dd9ba2117ca9c461aba3983f..a65b8d252b5bb4caf23cf40bc1d8090d0ca4018f 100644
--- a/ash/wm/maximize_mode/maximize_mode_event_handler.cc
+++ b/ash/wm/maximize_mode/maximize_mode_event_handler.cc
@@ -6,7 +6,6 @@
#include "ash/session/session_controller.h"
#include "ash/shell.h"
-#include "ash/system/tray/system_tray_delegate.h"
#include "ash/wm/window_state.h"
#include "ash/wm/window_util.h"
#include "ash/wm/wm_event.h"
@@ -55,11 +54,10 @@ bool MaximizeModeEventHandler::ToggleFullscreen(const ui::TouchEvent& event) {
}
// Do not exit fullscreen in kiosk mode.
- SystemTrayDelegate* system_tray_delegate =
- Shell::Get()->system_tray_delegate();
- if (system_tray_delegate->GetUserLoginStatus() == LoginStatus::KIOSK_APP ||
- system_tray_delegate->GetUserLoginStatus() ==
- LoginStatus::ARC_KIOSK_APP) {
+ const LoginStatus login_status =
+ Shell::Get()->session_controller()->login_status();
+ if (login_status == LoginStatus::KIOSK_APP ||
+ login_status == LoginStatus::ARC_KIOSK_APP) {
return false;
}

Powered by Google App Engine
This is Rietveld 408576698