chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc - Issue 1096293003: Move screenlock_bridge to components/proximity_auth

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/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc

Issue 1096293003: Move screenlock_bridge to components/proximity_auth (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years, 8 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/signin/easy_unlock_util.cc ('K') | « chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc ('k') | chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h » ('j') | components/proximity_auth/screenlock_bridge.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc

index 4a015d7829036b9ac325ff16bb18c795763300bc..d533099ee9040f12b25dd35a600950a7f78dddeb 100644

--- a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc

@@ -225,10 +225,8 @@ void SupervisedUserCreationScreenHandler::Show() {

bool is_owner = ((*it)->email() == owner);

base::DictionaryValue* user_dict = new base::DictionaryValue();

UserSelectionScreen::FillUserDictionary(

- *it,

- is_owner,

- false, /* is_signin_to_add */

- ScreenlockBridge::LockHandler::OFFLINE_PASSWORD,

+ *it, is_owner, false, /* is_signin_to_add */

+ proximity_auth::ScreenlockBridge::LockHandler::OFFLINE_PASSWORD,

NULL, /* public_session_recommended_locales */

user_dict);

users_list->Append(user_dict);