chrome/browser/chromeos/login/user_manager_impl.h - Issue 23678007: OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/user_manager_impl.h

Issue 23678007: OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 3 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

« chrome/browser/chromeos/login/oauth2_login_manager.h ('K') | « chrome/browser/chromeos/login/user_manager.h ('k') | chrome/browser/chromeos/login/user_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/user_manager_impl.h

diff --git a/chrome/browser/chromeos/login/user_manager_impl.h b/chrome/browser/chromeos/login/user_manager_impl.h

index db9f1ba64d40343deb5186658e21e6f45e1e5bff..7713966b09b6e3c2402501b4c3573b481753d889 100644

--- a/chrome/browser/chromeos/login/user_manager_impl.h

+++ b/chrome/browser/chromeos/login/user_manager_impl.h

@@ -106,6 +106,7 @@ class UserManagerImpl

virtual bool IsLoggedInAsKioskApp() const OVERRIDE;

virtual bool IsLoggedInAsStub() const OVERRIDE;

virtual bool IsSessionStarted() const OVERRIDE;

+ virtual int64 GetSessionDurationInSeconds() const OVERRIDE;

virtual bool UserSessionsRestored() const OVERRIDE;

virtual MergeSessionState GetMergeSessionState() const OVERRIDE;

virtual void SetMergeSessionState(MergeSessionState status) OVERRIDE;

@@ -344,6 +345,9 @@ class UserManagerImpl

// True if SessionStarted() has been called.

bool session_started_;

+ // Time of the session start event.

+ base::Time session_start_time_;

// True is user sessions has been restored after crash.

// On a normal boot then login into user sessions this will be false.

bool user_sessions_restored_;