| Index: components/session_manager/core/session_manager.h
|
| diff --git a/components/session_manager/core/session_manager.h b/components/session_manager/core/session_manager.h
|
| index c1fdc8646be1f69d2c24105c4a37c0262440e528..d7c66757c183810dc1a91a48394bebad575de29c 100644
|
| --- a/components/session_manager/core/session_manager.h
|
| +++ b/components/session_manager/core/session_manager.h
|
| @@ -9,39 +9,12 @@
|
|
|
| #include "base/macros.h"
|
| #include "components/session_manager/session_manager_export.h"
|
| +#include "components/session_manager/session_manager_types.h"
|
|
|
| namespace session_manager {
|
|
|
| class SessionManagerDelegate;
|
|
|
| -// TODO(nkostylev): Get rid/consolidate with:
|
| -// ash::SessionStateDelegate::SessionState and chromeos::LoggedInState.
|
| -enum SessionState {
|
| - // Default value, when session state hasn't been initialized yet.
|
| - SESSION_STATE_UNKNOWN = 0,
|
| -
|
| - // Running out of box UI.
|
| - SESSION_STATE_OOBE,
|
| -
|
| - // Running login UI (primary user) but user sign in hasn't completed yet.
|
| - SESSION_STATE_LOGIN_PRIMARY,
|
| -
|
| - // Running login UI (primary or secondary user), user sign in has been
|
| - // completed but login UI hasn't been hidden yet. This means that either
|
| - // some session initialization is happening or user has to go through some
|
| - // UI flow on the same login UI like select avatar, agree to terms of
|
| - // service etc.
|
| - SESSION_STATE_LOGGED_IN_NOT_ACTIVE,
|
| -
|
| - // A user(s) has logged in *and* login UI is hidden i.e. user session is
|
| - // not blocked.
|
| - SESSION_STATE_ACTIVE,
|
| -
|
| - // Same as SESSION_STATE_LOGIN_PRIMARY but for multi-profiles sign in i.e.
|
| - // when there's at least one user already active in the session.
|
| - SESSION_STATE_LOGIN_SECONDARY,
|
| -};
|
| -
|
| class SESSION_EXPORT SessionManager {
|
| public:
|
| SessionManager();
|
|
|