chrome/browser/ui/ash/session_state_delegate_chromeos.h - 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/ui/ash/session_state_delegate_chromeos.h

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:

Index: chrome/browser/ui/ash/session_state_delegate_chromeos.h

diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos.h b/chrome/browser/ui/ash/session_state_delegate_chromeos.h

index 93f9b7da3666bd9f38a17422592d0f8751d3be7f..3f9d2affd52fae43d72be7c88d40347d3e8fd2f1 100644

--- a/chrome/browser/ui/ash/session_state_delegate_chromeos.h

+++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.h

@@ -10,8 +10,8 @@

#include "base/compiler_specific.h"

#include "base/observer_list.h"

#include "chrome/browser/chromeos/login/ui/user_adding_screen.h"

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

#include "chromeos/login/login_state.h"

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

namespace ash {

class SessionStateObserver;

@@ -20,7 +20,7 @@ class SessionStateObserver;

class SessionStateDelegateChromeos

: public ash::SessionStateDelegate,

public chromeos::LoginState::Observer,

- public chromeos::UserManager::UserSessionStateObserver,

+ public user_manager::UserManager::UserSessionStateObserver,

public chromeos::UserAddingScreen::Observer {

public:

SessionStateDelegateChromeos();

@@ -57,7 +57,7 @@ class SessionStateDelegateChromeos

// chromeos::LoginState::Observer overrides.

virtual void LoggedInStateChanged() OVERRIDE;

- // chromeos::UserManager::UserSessionStateObserver:

+ // user_manager::UserManager::UserSessionStateObserver:

virtual void ActiveUserChanged(

const user_manager::User* active_user) OVERRIDE;

virtual void UserAddedToSession(