chrome/browser/chromeos/login/supervised/supervised_user_authentication.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

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/login/supervised/supervised_user_authentication.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: similarity Created 6 years, 4 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

« chrome/browser/chromeos/first_run/first_run.cc ('K') | « chrome/browser/chromeos/login/signin/oauth2_login_manager.cc ('k') | chrome/browser/chromeos/login/supervised/supervised_user_creation_browsertest.cc » ('j') | chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/supervised/supervised_user_authentication.cc

diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_authentication.cc b/chrome/browser/chromeos/login/supervised/supervised_user_authentication.cc

index a7889eb2b5dcee994b5999cad2c9baa025bb90ca..bd65b300708fca18dd4292b7176872b41eb6f481 100644

--- a/chrome/browser/chromeos/login/supervised/supervised_user_authentication.cc

+++ b/chrome/browser/chromeos/login/supervised/supervised_user_authentication.cc

@@ -13,11 +13,11 @@

#include "base/threading/sequenced_worker_pool.h"

#include "chrome/browser/chromeos/login/supervised/supervised_user_constants.h"

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

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

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

#include "chromeos/cryptohome/signed_secret.pb.h"

#include "chromeos/login/auth/key.h"

#include "components/user_manager/user.h"

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

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

#include "crypto/hmac.h"

#include "crypto/random.h"

@@ -224,7 +224,7 @@ void SupervisedUserAuthentication::ScheduleSupervisedPasswordChange(

const std::string& supervised_user_id,

const base::DictionaryValue* password_data) {

const user_manager::User* user =

- UserManager::Get()->FindUser(supervised_user_id);

+ user_manager::UserManager::Get()->FindUser(supervised_user_id);

base::FilePath profile_path = ProfileHelper::GetProfilePathByUserIdHash(

user->username_hash());

JSONFileValueSerializer serializer(profile_path.Append(kPasswordUpdateFile));

@@ -281,7 +281,8 @@ void SupervisedUserAuthentication::LoadPasswordUpdateData(

const std::string& user_id,

const PasswordDataCallback& success_callback,

const base::Closure& failure_callback) {

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

+ const user_manager::User* user =

+ user_manager::UserManager::Get()->FindUser(user_id);

base::FilePath profile_path =

ProfileHelper::GetProfilePathByUserIdHash(user->username_hash());

PostTaskAndReplyWithResult(