chrome/browser/chromeos/ownership/owner_settings_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/chromeos/ownership/owner_settings_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:

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

Download patch

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

Index: chrome/browser/chromeos/ownership/owner_settings_service_factory.cc

diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_factory.cc b/chrome/browser/chromeos/ownership/owner_settings_service_factory.cc

index e69f77eac99cec4dde1113b966c68f2305514927..51c448e83265e9880f192871a62ebd3a892499e3 100644

--- a/chrome/browser/chromeos/ownership/owner_settings_service_factory.cc

+++ b/chrome/browser/chromeos/ownership/owner_settings_service_factory.cc

@@ -4,12 +4,12 @@

#include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"

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

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

#include "chrome/browser/chromeos/ownership/owner_settings_service.h"

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

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

#include "components/keyed_service/content/browser_context_dependency_manager.h"

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

namespace chromeos {

@@ -38,7 +38,7 @@ void OwnerSettingsServiceFactory::SetUsername(const std::string& username) {

username_ = username;

if (!UserManager::IsInitialized())

return;

- const User* user = UserManager::Get()->FindUser(username_);

+ const user_manager::User* user = UserManager::Get()->FindUser(username_);

if (!user || !user->is_profile_created())

return;

Profile* profile = ProfileHelper::Get()->GetProfileByUser(user);