chrome/browser/chromeos/login/easy_unlock/bootstrap_user_flow.cc - Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId.

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/easy_unlock/bootstrap_user_flow.cc

Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

Patch Set: Created 5 years, 2 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/login/easy_unlock/bootstrap_user_context_initializer.cc ('k') | chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/easy_unlock/bootstrap_user_flow.cc

diff --git a/chrome/browser/chromeos/login/easy_unlock/bootstrap_user_flow.cc b/chrome/browser/chromeos/login/easy_unlock/bootstrap_user_flow.cc

index acf5cf5593e716b010bfd128442a87b29713732b..64a6b33af1d011e248fd3398b986aee680ee0a1f 100644

--- a/chrome/browser/chromeos/login/easy_unlock/bootstrap_user_flow.cc

+++ b/chrome/browser/chromeos/login/easy_unlock/bootstrap_user_flow.cc

@@ -14,20 +14,19 @@

#include "chrome/browser/signin/easy_unlock_service.h"

#include "chrome/browser/signin/easy_unlock_service_regular.h"

#include "components/proximity_auth/screenlock_bridge.h"

-#include "components/signin/core/account_id/account_id.h"

namespace chromeos {

BootstrapUserFlow::BootstrapUserFlow(const UserContext& user_context,

bool is_new_account)

- : ExtendedUserFlow(user_context.GetAccountId().GetUserEmail()),

+ : ExtendedUserFlow(user_context.GetUserID()),

user_context_(user_context),

is_new_account_(is_new_account),

finished_(false),

user_profile_(nullptr),

weak_ptr_factory_(this) {

ChromeUserManager::Get()->GetBootstrapManager()->AddPendingBootstrap(

- user_context_.GetAccountId().GetUserEmail());

+ user_context_.GetUserID());

}

BootstrapUserFlow::~BootstrapUserFlow() {

@@ -111,7 +110,7 @@

finished_ = true;

ChromeUserManager::Get()->GetBootstrapManager()->FinishPendingBootstrap(

- user_context_.GetAccountId().GetUserEmail());

+ user_context_.GetUserID());

UserSessionManager::GetInstance()->DoBrowserLaunch(user_profile_, host());

user_profile_ = nullptr;