chrome/browser/chromeos/policy/cloud_external_data_policy_observer.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/chromeos/policy/cloud_external_data_policy_observer.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/ownership/owner_settings_service_factory.cc ('k') | chrome/browser/chromeos/policy/device_local_account_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 9955cd992208bf4ae6c5f265814e69c87778bddd..084d12d1036615f6d102ab639cdb6478e88ae8e2 100644

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

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

@@ -13,7 +13,6 @@

#include "base/stl_util.h"

#include "base/values.h"

#include "chrome/browser/chrome_notification_types.h"

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

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

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

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

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

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

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

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

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

#include "content/public/browser/notification_details.h"

#include "content/public/browser/notification_service.h"

#include "content/public/browser/notification_source.h"

@@ -168,7 +168,7 @@ void CloudExternalDataPolicyObserver::Observe(

}

Profile* profile = content::Details<Profile>(details).ptr();

- const chromeos::User* user =

+ const user_manager::User* user =

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

if (!user) {

NOTREACHED();