ash: Merge LoginStatus update code path

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>
 
 #include "ash/ash_export.h"
+#include "ash/common/login_status.h"
 #include "ash/public/cpp/session_types.h"
 #include "ash/public/interfaces/session_controller.mojom.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 
 class AccountId;
 
 namespace ash {
 
-enum class LoginStatus;
 class SessionStateObserver;
 
 // Implements mojom::SessionController to cache session related info such as
 // session state, meta data about user sessions to support synchronous
 // queries for ash. It is targeted as a replacement for SessionStateDelegate.
 class ASH_EXPORT SessionController
     : NON_EXPORTED_BASE(public mojom::SessionController) {
  public:
   SessionController();
   ~SessionController() override;
@@ skipping 55 matching lines @@
   // 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;

[James Cook, 2017/04/05 00:16:24]

optional: Maybe change to inline login_status() getter?

[xiyuan, 2017/04/05 22:29:07]

Done.

 
   // 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);
 
+  // Calculate login status based on session state and active user session.
+  LoginStatus CalculateLoginStatus() const;
+
   // Helper that returns login status when the session state is ACTIVE.
-  LoginStatus GetLoginStatusForActiveSession() const;
+  LoginStatus CalculateLoginStatusForActiveSession() const;
+
+  // Update the |login_status_| and notify observers.
+  void UpdateLoginStatus();
 
   // 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_;
 
   // 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;
 
+  // Last known login status. Used to track login status changes.
+  LoginStatus login_status_ = LoginStatus::NOT_LOGGED_IN;
+
   base::ObserverList<ash::SessionStateObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SESSION_SESSION_CONTROLLER_H_