Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2933)

Unified Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 22856002: Add string for case when supervised user creation is disabled due to "only these users can log in" … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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
Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index 922a60dcc6eb21d2335e3d781b62b3607bc3778e..fb2c65b2eb202d7dd2d2e38b16f9b44a09eaa81e 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -456,8 +456,6 @@ void SigninScreenHandler::DeclareLocalizedValues(
IDS_CREATE_LOCALLY_MANAGED_USER_HTML);
builder->Add("createManagedUserFeatureName",
IDS_CREATE_LOCALLY_MANAGED_USER_FEATURE_NAME);
- builder->Add("createManagedUserNoManagerText",
- IDS_CREATE_LOCALLY_MANAGED_USER_NO_MANAGER_TEXT);
builder->Add("offlineLogin", IDS_OFFLINE_LOGIN_HTML);
builder->Add("ownerUserPattern", IDS_LOGIN_POD_OWNER_USER);
builder->Add("removeUser", IDS_LOGIN_POD_REMOVE_USER);
@@ -1098,13 +1096,24 @@ void SigninScreenHandler::UpdateAuthParams(DictionaryValue* params) {
bool managed_users_allowed =
UserManager::Get()->AreLocallyManagedUsersAllowed();
- bool managed_users_can_create = false;
- if (managed_users_allowed) {
- managed_users_can_create =
- (delegate_->GetUsers().size() > 0) && allow_new_user;
+ bool managed_users_can_create = true;
+ LOG(ERROR) << "Allow new users " << managed_users_allowed;
Nikita (slow) 2013/08/12 15:20:42 nit: Remove debug logging.
+ int message_id = -1;
+ if (delegate_->GetUsers().size() == 0) {
+ managed_users_can_create = false;
+ message_id = IDS_CREATE_LOCALLY_MANAGED_USER_NO_MANAGER_TEXT;
}
+ if (!allow_new_user) {
+ managed_users_can_create = false;
+ message_id = IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_RESTRICTED_TEXT;
+ }
+
params->SetBoolean("managedUsersEnabled", managed_users_allowed);
params->SetBoolean("managedUsersCanCreate", managed_users_can_create);
+ if (!managed_users_can_create) {
+ params->SetString("managedUsersRestrictionReason",
+ l10n_util::GetStringUTF16(message_id));
+ }
}
void SigninScreenHandler::LoadAuthExtension(

Powered by Google App Engine
This is Rietveld 408576698