Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(561)

Unified Diff: components/session_manager/core/session_manager.h

Issue 2438063002: user_manager: Remove deps on session_manager (Closed)
Patch Set: fix nits in PS1 Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 d7c66757c183810dc1a91a48394bebad575de29c..e7550e1032e5f64c4970139f808accb673ddbd8e 100644
--- a/components/session_manager/core/session_manager.h
+++ b/components/session_manager/core/session_manager.h
@@ -27,6 +27,19 @@ class SESSION_EXPORT SessionManager {
SessionState session_state() const { return session_state_; }
virtual void SetSessionState(SessionState state);
+ // Returns true if we're logged in and browser has been started i.e.
+ // browser_creator.LaunchBrowser(...) was called after sign in
+ // or restart after crash.
+ virtual bool IsSessionStarted() const;
+
+ // Called when browser session is started i.e. after
+ // browser_creator.LaunchBrowser(...) was called after user sign in.
+ // When user is at the image screen IsUserLoggedIn() will return true
+ // but IsSessionStarted() will return false. During the kiosk splash screen,
+ // we perform additional initialization after the user is logged in but
+ // before the session has been started.
+ virtual void SessionStarted();
+
// Let session delegate executed on its plan of actions depending on the
// current session type / state.
void Start();
@@ -46,9 +59,12 @@ class SESSION_EXPORT SessionManager {
// g_browser_process->platform_part().
static SessionManager* instance;
- SessionState session_state_;
+ SessionState session_state_ = SessionState::UNKNOWN;
std::unique_ptr<SessionManagerDelegate> delegate_;
+ // True if SessionStarted() has been called.
+ bool session_started_ = false;
+
DISALLOW_COPY_AND_ASSIGN(SessionManager);
};
@@ -64,7 +80,7 @@ class SESSION_EXPORT SessionManagerDelegate {
virtual void Start() = 0;
protected:
- session_manager::SessionManager* session_manager_;
+ session_manager::SessionManager* session_manager_ = nullptr;
private:
DISALLOW_COPY_AND_ASSIGN(SessionManagerDelegate);
« no previous file with comments | « chrome/browser/ui/ash/session_state_delegate_chromeos.cc ('k') | components/session_manager/core/session_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698