| Index: ash/metrics/user_metrics_recorder.cc
|
| diff --git a/ash/metrics/user_metrics_recorder.cc b/ash/metrics/user_metrics_recorder.cc
|
| index f06b8c6f8a00ae8617c6c94c515586c4c3b11b3f..a6ff35eafe6f271c10eeb30f26cd1d2f4cf67d29 100644
|
| --- a/ash/metrics/user_metrics_recorder.cc
|
| +++ b/ash/metrics/user_metrics_recorder.cc
|
| @@ -8,13 +8,13 @@
|
| #include "ash/metrics/pointer_metrics_recorder.h"
|
| #include "ash/public/cpp/shelf_item.h"
|
| #include "ash/public/cpp/shell_window_ids.h"
|
| +#include "ash/session/session_controller.h"
|
| #include "ash/session/session_state_delegate.h"
|
| #include "ash/shelf/shelf_model.h"
|
| #include "ash/shelf/shelf_view.h"
|
| #include "ash/shelf/wm_shelf.h"
|
| #include "ash/shell.h"
|
| #include "ash/shell_port.h"
|
| -#include "ash/system/tray/system_tray_delegate.h"
|
| #include "ash/wm/window_state.h"
|
| #include "ash/wm/window_state_aura.h"
|
| #include "ash/wm_window.h"
|
| @@ -79,34 +79,21 @@ ActiveWindowStateType GetActiveWindowState() {
|
|
|
| // Returns true if kiosk mode is active.
|
| bool IsKioskModeActive() {
|
| - return Shell::Get()->system_tray_delegate()->GetUserLoginStatus() ==
|
| + return Shell::Get()->session_controller()->login_status() ==
|
| LoginStatus::KIOSK_APP;
|
| }
|
|
|
| // Returns true if ARC kiosk mode is active.
|
| bool IsArcKioskModeActive() {
|
| - return Shell::Get()->system_tray_delegate()->GetUserLoginStatus() ==
|
| + return Shell::Get()->session_controller()->login_status() ==
|
| LoginStatus::ARC_KIOSK_APP;
|
| }
|
|
|
| // Returns true if there is an active user and their session isn't currently
|
| // locked.
|
| bool IsUserActive() {
|
| - switch (Shell::Get()->system_tray_delegate()->GetUserLoginStatus()) {
|
| - case LoginStatus::NOT_LOGGED_IN:
|
| - case LoginStatus::LOCKED:
|
| - return false;
|
| - case LoginStatus::USER:
|
| - case LoginStatus::OWNER:
|
| - case LoginStatus::GUEST:
|
| - case LoginStatus::PUBLIC:
|
| - case LoginStatus::SUPERVISED:
|
| - case LoginStatus::KIOSK_APP:
|
| - case LoginStatus::ARC_KIOSK_APP:
|
| - return true;
|
| - }
|
| - NOTREACHED();
|
| - return false;
|
| + SessionController* session = Shell::Get()->session_controller();
|
| + return session->IsActiveUserSessionStarted() && !session->IsScreenLocked();
|
| }
|
|
|
| // Array of window container ids that contain visible windows to be counted for
|
|
|