chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc - Issue 824683002: UserManager stack refactoring.

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 824683002: UserManager stack refactoring. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Split for FakeManager complete. Created 5 years, 11 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/ui/webui/chromeos/login/gaia_screen_handler.cc ('K') | « chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | components/user_manager/fake_user_manager.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 0bb7b32a195bb80cf6a5bb01eaef7b992b134235..d0bfebc2ee3c2b568f21faa908cf6dae4cade0a5 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

@@ -211,7 +211,7 @@ void SupervisedUserCreationScreenHandler::Show() {

scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());

scoped_ptr<base::ListValue> users_list(new base::ListValue());

const user_manager::UserList& users =

- user_manager::UserManager::Get()

+ chromeos::ChromeUserManager::Get()

Nikita (slow) 2015/01/20 18:18:22 nit: drop chromeos

merkulova 2015/01/21 14:10:34 Done.

->GetUsersAllowedForSupervisedUsersCreation();

std::string owner;

chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);