chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.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/policy/user_cloud_policy_manager_chromeos.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/policy/policy_cert_service_factory.cc ('k') | chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc

diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc

index f7c8d54b5a492b7835732b5fd83045001f600058..1dc5111a831da02dbb6aa0803d86b10b3bb914a5 100644

--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc

+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc

@@ -25,6 +25,7 @@

#include "components/policy/core/common/policy_map.h"

#include "components/policy/core/common/policy_pref_names.h"

#include "components/policy/core/common/policy_types.h"

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

#include "net/url_request/url_request_context_getter.h"

#include "policy/policy_constants.h"

#include "url/gurl.h"

@@ -63,7 +64,7 @@ void OnWildcardCheckCompleted(const std::string& username,

// logged-in session is not possible. Fix this either by delaying the

// cryptohome deletion operation or by getting rid of the in-session

// wildcard check.

- chromeos::UserManager::Get()->RemoveUserFromList(username);

+ user_manager::UserManager::Get()->RemoveUserFromList(username);

chrome::AttemptUserExit();

}