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

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

index 29728508fedf4eea370f1ddd6ce426b9753deb0b..94dbbc8f9e11000d24c57fa78117e90f3dc31951 100644

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

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

@@ -14,12 +14,12 @@

#if defined(OS_CHROMEOS)

#include "chrome/browser/browser_process.h"

#include "chrome/browser/browser_process_platform_part_chromeos.h"

-#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_local_account_policy_service.h"

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

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

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

#endif

namespace policy {

@@ -38,7 +38,7 @@ DeviceLocalAccountPolicyBroker* GetBroker(content::BrowserContext* context) {

return NULL;

}

- chromeos::User* user =

+ user_manager::User* user =

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

if (!user)

return NULL;