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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

Issue 425293002: Rename "managed (mode|user)" to "supervised user" (part 9) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 // 1. Enterprise managed device > is allowed by policy. 51 // 1. Enterprise managed device > is allowed by policy.
52 // 2. Consumer device > owner exists. 52 // 2. Consumer device > owner exists.
53 // 3. New users are allowed by owner. 53 // 3. New users are allowed by owner.
54 // 4. Supervised users are allowed by owner. 54 // 4. Supervised users are allowed by owner.
55 bool supervised_users_allowed = 55 bool supervised_users_allowed =
56 UserManager::Get()->AreSupervisedUsersAllowed(); 56 UserManager::Get()->AreSupervisedUsersAllowed();
57 bool supervised_users_can_create = true; 57 bool supervised_users_can_create = true;
58 int message_id = -1; 58 int message_id = -1;
59 if (!has_users) { 59 if (!has_users) {
60 supervised_users_can_create = false; 60 supervised_users_can_create = false;
61 message_id = IDS_CREATE_LOCALLY_MANAGED_USER_NO_MANAGER_TEXT; 61 message_id = IDS_CREATE_SUPERVISED_USER_NO_MANAGER_TEXT;
62 } 62 }
63 if (!allow_new_user || !supervised_users_allowed) { 63 if (!allow_new_user || !supervised_users_allowed) {
64 supervised_users_can_create = false; 64 supervised_users_can_create = false;
65 message_id = IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_RESTRICTED_TEXT; 65 message_id = IDS_CREATE_SUPERVISED_USER_CREATION_RESTRICTED_TEXT;
66 } 66 }
67 67
68 params->SetBoolean("supervisedUsersEnabled", supervised_users_allowed); 68 params->SetBoolean("supervisedUsersEnabled", supervised_users_allowed);
69 params->SetBoolean("supervisedUsersCanCreate", supervised_users_can_create); 69 params->SetBoolean("supervisedUsersCanCreate", supervised_users_can_create);
70 if (!supervised_users_can_create) { 70 if (!supervised_users_can_create) {
71 params->SetString("supervisedUsersRestrictionReason", 71 params->SetString("supervisedUsersRestrictionReason",
72 l10n_util::GetStringUTF16(message_id)); 72 l10n_util::GetStringUTF16(message_id));
73 } 73 }
74 74
75 // Now check whether we're in multi-profiles user adding scenario and 75 // Now check whether we're in multi-profiles user adding scenario and
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 } 208 }
209 209
210 void GaiaScreenHandler::DeclareLocalizedValues( 210 void GaiaScreenHandler::DeclareLocalizedValues(
211 LocalizedValuesBuilder* builder) { 211 LocalizedValuesBuilder* builder) {
212 builder->Add("signinScreenTitle", IDS_SIGNIN_SCREEN_TITLE); 212 builder->Add("signinScreenTitle", IDS_SIGNIN_SCREEN_TITLE);
213 builder->Add("signinScreenPasswordChanged", 213 builder->Add("signinScreenPasswordChanged",
214 IDS_SIGNIN_SCREEN_PASSWORD_CHANGED); 214 IDS_SIGNIN_SCREEN_PASSWORD_CHANGED);
215 builder->Add("createAccount", IDS_CREATE_ACCOUNT_HTML); 215 builder->Add("createAccount", IDS_CREATE_ACCOUNT_HTML);
216 builder->Add("guestSignin", IDS_BROWSE_WITHOUT_SIGNING_IN_HTML); 216 builder->Add("guestSignin", IDS_BROWSE_WITHOUT_SIGNING_IN_HTML);
217 builder->Add("createSupervisedUser", 217 builder->Add("createSupervisedUser",
218 IDS_CREATE_LOCALLY_MANAGED_USER_HTML); 218 IDS_CREATE_SUPERVISED_USER_HTML);
219 builder->Add("createSupervisedUserFeatureName", 219 builder->Add("createSupervisedUserFeatureName",
220 IDS_CREATE_LOCALLY_MANAGED_USER_FEATURE_NAME); 220 IDS_CREATE_SUPERVISED_USER_FEATURE_NAME);
221 builder->Add("consumerManagementEnrollmentSigninMessage", 221 builder->Add("consumerManagementEnrollmentSigninMessage",
222 IDS_LOGIN_CONSUMER_MANAGEMENT_ENROLLMENT); 222 IDS_LOGIN_CONSUMER_MANAGEMENT_ENROLLMENT);
223 223
224 // Strings used by the SAML fatal error dialog. 224 // Strings used by the SAML fatal error dialog.
225 builder->Add("fatalErrorMessageNoEmail", IDS_LOGIN_FATAL_ERROR_NO_EMAIL); 225 builder->Add("fatalErrorMessageNoEmail", IDS_LOGIN_FATAL_ERROR_NO_EMAIL);
226 builder->Add("fatalErrorMessageNoPassword", 226 builder->Add("fatalErrorMessageNoPassword",
227 IDS_LOGIN_FATAL_ERROR_NO_PASSWORD); 227 IDS_LOGIN_FATAL_ERROR_NO_PASSWORD);
228 builder->Add("fatalErrorMessageVerificationFailed", 228 builder->Add("fatalErrorMessageVerificationFailed",
229 IDS_LOGIN_FATAL_ERROR_PASSWORD_VERIFICATION); 229 IDS_LOGIN_FATAL_ERROR_PASSWORD_VERIFICATION);
230 builder->Add("fatalErrorMessageInsecureURL", 230 builder->Add("fatalErrorMessageInsecureURL",
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 561
562 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { 562 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
563 DCHECK(signin_screen_handler_); 563 DCHECK(signin_screen_handler_);
564 return signin_screen_handler_->delegate_; 564 return signin_screen_handler_->delegate_;
565 } 565 }
566 566
567 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) { 567 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) {
568 signin_screen_handler_ = handler; 568 signin_screen_handler_ = handler;
569 } 569 }
570 } // namespace chromeos 570 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698