ash: Use session_manager::SessionState

chrome/browser/ui/ash/session_state_delegate_chromeos.cc

 // Copyright (c) 2013 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.
 
 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/session/session_state_observer.h"
 #include "ash/content/shell_content_state.h"
 #include "base/bind.h"
@@ skipping 16 matching lines @@
 #include "chromeos/login/login_state.h"
 #include "components/prefs/pref_service.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_info.h"
 #include "components/user_manager/user_manager.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "ui/gfx/image/image_skia.h"
 
 SessionStateDelegateChromeos::SessionStateDelegateChromeos()
-    : session_state_(SESSION_STATE_LOGIN_PRIMARY) {
+    : session_state_(session_manager::SessionState::LOGIN_PRIMARY) {
   user_manager::UserManager::Get()->AddSessionStateObserver(this);
   chromeos::UserAddingScreen::Get()->AddObserver(this);
 
   // LoginState is not initialized in unit_tests.
   if (chromeos::LoginState::IsInitialized()) {
     chromeos::LoginState::Get()->AddObserver(this);

[stevenjb, 2016/10/17 22:59:34]

We might want to add a comment here that we are only setting SessionState to
ACTIVE or PRIMARY instead of using SessionManager::Get()->session_state()
directly, with a TODO that we should consider doing so. (I wouldn't try to make
that change in this CL though).

[xiyuan, 2016/10/17 23:17:28]

Added a comment. My goal is to replace SessionStateDelegate with a pair of mojo
interfaces (ash -> chrome and chrome -> ash). And the replacement would get real
state from SessionManager and have getters/helpers to translate the states for
ash.

Current plan for the replacement is here:
https://bugs.chromium.org/p/chromium/issues/detail?id=648964#c7

-    SetSessionState(chromeos::LoginState::Get()->IsUserLoggedIn() ?
-        SESSION_STATE_ACTIVE : SESSION_STATE_LOGIN_PRIMARY, true);
+    SetSessionState(chromeos::LoginState::Get()->IsUserLoggedIn()
+                        ? session_manager::SessionState::ACTIVE
+                        : session_manager::SessionState::LOGIN_PRIMARY,
+                    true);
   }
 }
 
 SessionStateDelegateChromeos::~SessionStateDelegateChromeos() {
   user_manager::UserManager::Get()->RemoveSessionStateObserver(this);
   chromeos::UserAddingScreen::Get()->RemoveObserver(this);
 
   // LoginState is not initialized in unit_tests.
   if (chromeos::LoginState::IsInitialized())
     chromeos::LoginState::Get()->RemoveObserver(this);
@@ skipping 70 matching lines @@
 }
 
 bool SessionStateDelegateChromeos::IsUserSessionBlocked() const {
   bool has_login_manager = base::CommandLine::ForCurrentProcess()->HasSwitch(
       chromeos::switches::kLoginManager);
   return (has_login_manager && !IsActiveUserSessionStarted()) ||
          IsScreenLocked() ||
          chromeos::UserAddingScreen::Get()->IsRunning();
 }
 
-ash::SessionStateDelegate::SessionState
-SessionStateDelegateChromeos::GetSessionState() const {
+session_manager::SessionState SessionStateDelegateChromeos::GetSessionState()
+    const {
   return session_state_;
 }
 
 const user_manager::UserInfo* SessionStateDelegateChromeos::GetUserInfo(
     ash::UserIndex index) const {
   DCHECK_LT(index, NumberOfLoggedInUsers());
   return user_manager::UserManager::Get()->GetLRULoggedInUsers()[index];
 }
 
 bool SessionStateDelegateChromeos::ShouldShowAvatar(
@@ skipping 76 matching lines @@
     ash::SessionStateObserver* observer) {
   session_state_observer_list_.AddObserver(observer);
 }
 
 void SessionStateDelegateChromeos::RemoveSessionStateObserver(
     ash::SessionStateObserver* observer) {
   session_state_observer_list_.RemoveObserver(observer);
 }
 
 void SessionStateDelegateChromeos::LoggedInStateChanged() {
-  SetSessionState(chromeos::LoginState::Get()->IsUserLoggedIn() ?
-      SESSION_STATE_ACTIVE : SESSION_STATE_LOGIN_PRIMARY, false);
+  SetSessionState(chromeos::LoginState::Get()->IsUserLoggedIn()
+                      ? session_manager::SessionState::ACTIVE
+                      : session_manager::SessionState::LOGIN_PRIMARY,
+                  false);
 }
 
 void SessionStateDelegateChromeos::ActiveUserChanged(
     const user_manager::User* active_user) {
   FOR_EACH_OBSERVER(ash::SessionStateObserver, session_state_observer_list_,
                     ActiveUserChanged(active_user->GetAccountId()));
 }
 
 void SessionStateDelegateChromeos::UserAddedToSession(
     const user_manager::User* added_user) {
   FOR_EACH_OBSERVER(ash::SessionStateObserver, session_state_observer_list_,
                     UserAddedToSession(added_user->GetAccountId()));
 }
 
 void SessionStateDelegateChromeos::OnUserAddingStarted() {
-  SetSessionState(SESSION_STATE_LOGIN_SECONDARY, false);
+  SetSessionState(session_manager::SessionState::LOGIN_SECONDARY, false);
 }
 
 void SessionStateDelegateChromeos::OnUserAddingFinished() {
-  SetSessionState(SESSION_STATE_ACTIVE, false);
+  SetSessionState(session_manager::SessionState::ACTIVE, false);
 }
 
-void SessionStateDelegateChromeos::SetSessionState(SessionState new_state,
-                                                   bool force) {
+void SessionStateDelegateChromeos::SetSessionState(
+    session_manager::SessionState new_state,
+    bool force) {
   if (session_state_ == new_state && !force)
     return;
 
   session_state_ = new_state;
   NotifySessionStateChanged();
 }
 
 void SessionStateDelegateChromeos::NotifySessionStateChanged() {
   FOR_EACH_OBSERVER(ash::SessionStateObserver,
                     session_state_observer_list_,
                     SessionStateChanged(session_state_));
 }
 
 void DoSwitchUser(const AccountId& account_id) {
   user_manager::UserManager::Get()->SwitchActiveUser(account_id);
 }
 
 void SessionStateDelegateChromeos::TryToSwitchUser(
     const AccountId& account_id) {
   TrySwitchingActiveUser(base::Bind(&DoSwitchUser, account_id));
 }