chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

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/session/restore_after_crash_session_manager_delegate.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 4 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

« no previous file with comments | « chrome/browser/chromeos/login/session/chrome_session_manager.cc ('k') | chrome/browser/chromeos/login/session/user_session_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc

diff --git a/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc b/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc

index 31c6513dbf2bafe3cba53ac0f6cf9f3de8f5cd57..1b43698569a27302cfb54af40278faf8312ba631 100644

--- a/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc

+++ b/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc

@@ -7,11 +7,11 @@

#include "base/command_line.h"

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/chromeos/login/session/user_session_manager.h"

-#include "chrome/browser/chromeos/login/users/user_manager.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/common/chrome_switches.h"

#include "chromeos/audio/cras_audio_handler.h"

#include "chromeos/chromeos_switches.h"

+#include "components/user_manager/user_manager.h"

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

namespace chromeos {

@@ -48,7 +48,7 @@ void RestoreAfterCrashSessionManagerDelegate::Start() {

content::Details<Profile>(profile()));

// This call will set session state to SESSION_STATE_ACTIVE (same one).

- UserManager::Get()->SessionStarted();

+ user_manager::UserManager::Get()->SessionStarted();

// Now is the good time to retrieve other logged in users for this session.

// First user has been already marked as logged in and active in