ash: Use SessionController instead of SessionStateDelegate

ash/common/session/session_controller.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_COMMON_SESSION_SESSION_CONTROLLER_H_
 #define ASH_COMMON_SESSION_SESSION_CONTROLLER_H_
 
 #include <stdint.h>
 
 #include <vector>
@@ skipping 43 matching lines @@
   // Returns true if the screen can be locked.
   bool CanLockScreen() const;
 
   // Returns true if the screen is currently locked.
   bool IsScreenLocked() const;
 
   // Returns true if the screen should be locked automatically when the screen
   // is turned off or the system is suspended.
   bool ShouldLockScreenAutomatically() const;
 
-  // Returns |true| if user session blocked by some overlying UI. It can be
+  // Returns true if user session blocked by some overlying UI. It can be
   // login screen, lock screen or screen for adding users into multi-profile
   // session.
   bool IsUserSessionBlocked() const;
 
+  // Convenience function that returns true if session state is LOGIN_SECONDARY.
+  bool IsInSecondaryLoginScreen() const;
+
   // Gets the ash session state.
   session_manager::SessionState GetSessionState() const;
 
   // Gets the user sessions in LRU order with the active session being first.
   const std::vector<mojom::UserSessionPtr>& GetUserSessions() const;
 
+  // Convenience helper to gets the user session at a given index. Returns
+  // nullptr if no user session is found for the index.
+  const mojom::UserSession* GetUserSession(UserIndex index) const;
+
   // Locks the screen. The locking happens asynchronously.
   void LockScreen();
 
   // Switches to another active user with |account_id| (if that user has
   // already signed in).
   void SwitchActiveUser(const AccountId& account_id);
 
   // Switches the active user to the next or previous user, with the same
   // ordering as user sessions are created.
   void CycleActiveUser(CycleUserDirection direction);
 
   void AddSessionStateObserver(SessionStateObserver* observer);
   void RemoveSessionStateObserver(SessionStateObserver* observer);
 
   // Returns the ash notion of login status.
   // NOTE: Prefer GetSessionState() in new code because the concept of
   // SessionState more closes matches the state in chrome.
   LoginStatus GetLoginStatus() const;
 
   // mojom::SessionController
   void SetClient(mojom::SessionControllerClientPtr client) override;
   void SetSessionInfo(mojom::SessionInfoPtr info) override;
   void UpdateUserSession(mojom::UserSessionPtr user_session) override;
   void SetUserSessionOrder(
       const std::vector<uint32_t>& user_session_order) override;
 
+  // Test helpers.
+  void ClearUserSessionsForTest();
+  void FlushMojoForTest();
+  void LockScreenAndFlushForTest();
+
  private:
   void SetSessionState(session_manager::SessionState state);
   void AddUserSession(mojom::UserSessionPtr user_session);
 
   // Helper that returns login status when the session state is ACTIVE.
   LoginStatus GetLoginStatusForActiveSession() const;
 
   // Bindings for mojom::SessionController interface.
   mojo::BindingSet<mojom::SessionController> bindings_;
 
   // Client interface to session manager code (chrome).
   mojom::SessionControllerClientPtr client_;
 
   // Cached session info.
   bool can_lock_ = false;
   bool should_lock_screen_automatically_ = false;
   AddUserSessionPolicy add_user_session_policy_ = AddUserSessionPolicy::ALLOWED;
-  session_manager::SessionState state_ = session_manager::SessionState::UNKNOWN;
+  session_manager::SessionState state_;
 
   // Cached user session info sorted by the order from SetUserSessionOrder.
   // Currently the session manager code (chrome) sets a LRU order with the
   // active session being the first.
   std::vector<mojom::UserSessionPtr> user_sessions_;
 
   // The user session id of the current active user session. User session id
   // is managed by session manager code, starting at 1. 0u is an invalid id
   // to detect first active user session.
   uint32_t active_session_id_ = 0u;
 
   base::ObserverList<ash::SessionStateObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SESSION_SESSION_CONTROLLER_H_