chrome/browser/policy/profile_policy_connector.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.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.cc

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

index bca188abde46070d1c38553e30d8fe81481826a3..85694c2a42886eb154b87c627a0cf25aa7228774 100644

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

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

@@ -20,12 +20,12 @@

#include "google_apis/gaia/gaia_auth_util.h"

#if defined(OS_CHROMEOS)

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

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

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

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

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

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

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

#endif

namespace policy {

@@ -56,7 +56,7 @@ ProfilePolicyConnector::~ProfilePolicyConnector() {}

void ProfilePolicyConnector::Init(

bool force_immediate_load,

#if defined(OS_CHROMEOS)

- const chromeos::User* user,

+ const user_manager::User* user,

#endif

SchemaRegistry* schema_registry,

CloudPolicyManager* user_cloud_policy_manager) {