chrome/browser/chromeos/login/users/multi_profile_user_controller.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/users/multi_profile_user_controller.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/users/mock_user_manager.cc ('k') | chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index d07936067424e9a65284723db77d8b6c4e72aead..f328c2c24287b74b3d107f66cfb349fa749fc2ab 100644

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

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

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

#include "base/prefs/pref_service.h"

#include "base/prefs/scoped_user_pref_update.h"

#include "chrome/browser/chromeos/login/users/multi_profile_user_controller_delegate.h"

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

#include "chrome/browser/chromeos/policy/policy_cert_service.h"

#include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"

#include "chrome/browser/chromeos/profiles/profile_helper.h"

@@ -19,6 +18,7 @@

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

#include "chrome/common/pref_names.h"

#include "components/user_manager/user.h"

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

#include "google_apis/gaia/gaia_auth_util.h"

namespace chromeos {

@@ -90,7 +90,7 @@ void MultiProfileUserController::RegisterProfilePrefs(

// static

MultiProfileUserController::UserAllowedInSessionReason

MultiProfileUserController::GetPrimaryUserPolicy() {

- UserManager* user_manager = UserManager::Get();

+ user_manager::UserManager* user_manager = user_manager::UserManager::Get();

CHECK(user_manager);

const user_manager::User* user = user_manager->GetPrimaryUser();

@@ -129,7 +129,7 @@ MultiProfileUserController::GetPrimaryUserPolicy() {

bool MultiProfileUserController::IsUserAllowedInSession(

const std::string& user_email,

MultiProfileUserController::UserAllowedInSessionReason* reason) const {

- UserManager* user_manager = UserManager::Get();

+ user_manager::UserManager* user_manager = user_manager::UserManager::Get();

CHECK(user_manager);

const user_manager::User* primary_user = user_manager->GetPrimaryUser();

@@ -208,7 +208,8 @@ void MultiProfileUserController::SetCachedValue(

}

void MultiProfileUserController::CheckSessionUsers() {

- const user_manager::UserList& users = UserManager::Get()->GetLoggedInUsers();

+ const user_manager::UserList& users =

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

for (user_manager::UserList::const_iterator it = users.begin();

it != users.end();

++it) {