chrome/browser/policy/profile_policy_connector_factory.cc - Issue 398753004: [cros] Move User class to user_manager component.

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/policy/profile_policy_connector_factory.cc

Issue 398753004: [cros] Move User class to user_manager component. (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:

Index: chrome/browser/policy/profile_policy_connector_factory.cc

diff --git a/chrome/browser/policy/profile_policy_connector_factory.cc b/chrome/browser/policy/profile_policy_connector_factory.cc

index 57cb2e6039b09be2853a7704e0936d33b620a689..e5ec872b53680c03e51665bcc701bfb776b2968c 100644

--- a/chrome/browser/policy/profile_policy_connector_factory.cc

+++ b/chrome/browser/policy/profile_policy_connector_factory.cc

@@ -14,10 +14,10 @@

#include "chrome/browser/policy/schema_registry_service.h"

#include "chrome/browser/policy/schema_registry_service_factory.h"

#if defined(OS_CHROMEOS)

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

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

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

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

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

#else

#include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"

#include "components/policy/core/common/cloud/user_cloud_policy_manager.h"

@@ -94,7 +94,7 @@ ProfilePolicyConnectorFactory::CreateForProfileInternal(

SchemaRegistryServiceFactory::GetForContext(profile)->registry();

#if defined(OS_CHROMEOS)

- chromeos::User* user = NULL;

+ user_manager::User* user = NULL;

if (!chromeos::ProfileHelper::IsSigninProfile(profile)) {

user = chromeos::ProfileHelper::Get()->GetUserByProfile(profile);

CHECK(user);