chrome/browser/signin/easy_unlock_app_manager.cc - 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/signin/easy_unlock_app_manager.cc

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/profiles/profile_window.cc ('K') | « chrome/browser/signin/easy_unlock_app_manager.h ('k') | chrome/browser/signin/easy_unlock_auth_attempt.h » ('j') | components/user_manager/user_id.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/signin/easy_unlock_app_manager.cc

diff --git a/chrome/browser/signin/easy_unlock_app_manager.cc b/chrome/browser/signin/easy_unlock_app_manager.cc

index 7d5799ebcae1b8b6fe819b919754156c40656ed6..14bb5c66c3705b71d86d967c23c8006e4cb519f3 100644

--- a/chrome/browser/signin/easy_unlock_app_manager.cc

+++ b/chrome/browser/signin/easy_unlock_app_manager.cc

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

#include "chrome/common/extensions/api/screenlock_private.h"

#include "chrome/common/extensions/extension_constants.h"

#include "components/proximity_auth/switches.h"

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

#include "extensions/browser/event_router.h"

#include "extensions/browser/extension_system.h"

#include "extensions/common/one_shot_event.h"

@@ -36,7 +37,7 @@ class EasyUnlockAppManagerImpl : public EasyUnlockAppManager {

void LoadApp() override;

void DisableAppIfLoaded() override;

void ReloadApp() override;

- bool SendUserUpdatedEvent(const std::string& user_id,

+ bool SendUserUpdatedEvent(const user_manager::UserID& user_id,

bool is_logged_in,

bool data_ready) override;

bool SendAuthAttemptEvent() override;

@@ -135,7 +136,7 @@ void EasyUnlockAppManagerImpl::ReloadApp() {

extension_service->ReloadExtension(app_id_);

}

-bool EasyUnlockAppManagerImpl::SendUserUpdatedEvent(const std::string& user_id,

+bool EasyUnlockAppManagerImpl::SendUserUpdatedEvent(const user_manager::UserID& user_id,

bool is_logged_in,

bool data_ready) {

extensions::EventRouter* event_router = extension_system_->event_router();