chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.h - Issue 1165323004: We should use UserID object to identify users instead of username.

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_creation_controller_new.h

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 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/login/signin/auth_sync_observer.cc ('K') | « chrome/browser/chromeos/login/supervised/supervised_user_creation_controller.h ('k') | chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.cc » ('j') | chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.h

diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.h b/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.h

index 6e0c6ac37eda66f821d54a5ee93471394b1f9d3e..f85d8dd6ea4604543c8fc2210a20f201bfda772f 100644

--- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.h

+++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.h

@@ -41,7 +41,7 @@ class SupervisedUserCreationControllerNew

// |Consumer| is not owned by controller, and it is expected that it wouldn't

// be deleted before SupervisedUserCreationControllerNew.

SupervisedUserCreationControllerNew(StatusConsumer* consumer,

- const std::string& manager_id);

+ const user_manager::UserID& manager_id);

~SupervisedUserCreationControllerNew() override;

// Returns the current supervised user controller if it has been created.

@@ -85,7 +85,7 @@ class SupervisedUserCreationControllerNew

void CancelCreation() override;

void FinishCreation() override;

- std::string GetSupervisedUserId() override;

+ const user_manager::UserID& GetSupervisedUserId() const override;

private:

enum Stage {

@@ -119,9 +119,9 @@ class SupervisedUserCreationControllerNew

base::string16 display_name;

int avatar_index;

- std::string manager_id;

+ user_manager::UserID manager_id;

- std::string local_user_id; // Used to identify cryptohome.

+ user_manager::UserID local_user_id; // Used to identify cryptohome.

std::string sync_user_id; // Used to identify user in manager's sync data.

// Keys: