trunk/src/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc - Issue 319273002: Revert 275550 "Revert 275046 "ChromeOS login webui 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: trunk/src/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc

Issue 319273002: Revert 275550 "Revert 275046 "ChromeOS login webui refactoring: ..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 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:

Index: trunk/src/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc

===================================================================

--- trunk/src/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc (revision 275554)

+++ trunk/src/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc (working copy)

@@ -8,12 +8,12 @@

#include "base/strings/utf_string_conversions.h"

#include "base/values.h"

#include "chrome/browser/chromeos/login/managed/locally_managed_user_creation_flow.h"

+#include "chrome/browser/chromeos/login/screens/user_selection_screen.h"

#include "chrome/browser/chromeos/login/users/supervised_user_manager.h"

#include "chrome/browser/chromeos/login/users/user_manager.h"

#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"

#include "chrome/browser/chromeos/settings/cros_settings.h"

#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"

-#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"

#include "chrome/common/url_constants.h"

#include "chromeos/audio/chromeos_sounds.h"

#include "google_apis/gaia/gaia_auth_util.h"

@@ -220,7 +220,7 @@

continue;

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

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

- SigninScreenHandler::FillUserDictionary(

+ UserSelectionScreen::FillUserDictionary(

*it,

is_owner,

false /* is_signin_to_add */,