chrome/browser/chromeos/login/users/user_manager_impl.cc - Issue 363613004: [cros] Define session_manager component with SessionManager base class

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/users/user_manager_impl.cc

Issue 363613004: [cros] Define session_manager component with SessionManager base class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 5 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/session/restore_after_crash_session_manager_delegate.h ('K') | « chrome/browser/chromeos/login/ui/user_adding_screen.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | components/session_manager/core/session_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/user_manager_impl.cc

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

index 9cb2ab242bc8457136c5f1ed396038af1f8112e7..bc9a98525cb6a6cba18fb8f74db69034752cf310 100644

--- a/chrome/browser/chromeos/login/users/user_manager_impl.cc

+++ b/chrome/browser/chromeos/login/users/user_manager_impl.cc

@@ -59,6 +59,7 @@

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/login/login_state.h"

#include "chromeos/settings/cros_settings_names.h"

+#include "components/session_manager/core/session_manager.h"

#include "components/user_manager/user_type.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/notification_service.h"

@@ -501,7 +502,11 @@ void UserManagerImpl::RestoreActiveSessions() {

void UserManagerImpl::SessionStarted() {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

session_started_ = true;

UpdateLoginState();

+ g_browser_process->platform_part()->session_manager()->SetSessionState(

+ session_manager::SessionManager::SESSION_STATE_ACTIVE);

content::NotificationService::current()->Notify(

chrome::NOTIFICATION_SESSION_STARTED,

content::Source<UserManager>(this),