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

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

Issue 403343002: Rename "managed (mode|user)" to "supervised user" (part 8) (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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 int message_id = -1; 57 int message_id = -1;
58 if (!has_users) { 58 if (!has_users) {
59 supervised_users_can_create = false; 59 supervised_users_can_create = false;
60 message_id = IDS_CREATE_LOCALLY_MANAGED_USER_NO_MANAGER_TEXT; 60 message_id = IDS_CREATE_LOCALLY_MANAGED_USER_NO_MANAGER_TEXT;
61 } 61 }
62 if (!allow_new_user || !supervised_users_allowed) { 62 if (!allow_new_user || !supervised_users_allowed) {
63 supervised_users_can_create = false; 63 supervised_users_can_create = false;
64 message_id = IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_RESTRICTED_TEXT; 64 message_id = IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_RESTRICTED_TEXT;
65 } 65 }
66 66
67 params->SetBoolean("managedUsersEnabled", supervised_users_allowed); 67 params->SetBoolean("supervisedUsersEnabled", supervised_users_allowed);
68 params->SetBoolean("managedUsersCanCreate", supervised_users_can_create); 68 params->SetBoolean("supervisedUsersCanCreate", supervised_users_can_create);
69 if (!supervised_users_can_create) { 69 if (!supervised_users_can_create) {
70 params->SetString("managedUsersRestrictionReason", 70 params->SetString("supervisedUsersRestrictionReason",
71 l10n_util::GetStringUTF16(message_id)); 71 l10n_util::GetStringUTF16(message_id));
72 } 72 }
73 73
74 // Now check whether we're in multi-profiles user adding scenario and 74 // Now check whether we're in multi-profiles user adding scenario and
75 // disable GAIA right panel features if that's the case. 75 // disable GAIA right panel features if that's the case.
76 if (UserAddingScreen::Get()->IsRunning()) { 76 if (UserAddingScreen::Get()->IsRunning()) {
77 params->SetBoolean("createAccount", false); 77 params->SetBoolean("createAccount", false);
78 params->SetBoolean("guestSignin", false); 78 params->SetBoolean("guestSignin", false);
79 params->SetBoolean("managedUsersEnabled", false); 79 params->SetBoolean("supervisedUsersEnabled", false);
80 } 80 }
81 } 81 }
82 82
83 void RecordSAMLScrapingVerificationResultInHistogram(bool success) { 83 void RecordSAMLScrapingVerificationResultInHistogram(bool success) {
84 UMA_HISTOGRAM_BOOLEAN("ChromeOS.SAML.Scraping.VerificationResult", success); 84 UMA_HISTOGRAM_BOOLEAN("ChromeOS.SAML.Scraping.VerificationResult", success);
85 } 85 }
86 86
87 // The Task posted to PostTaskAndReply in StartClearingDnsCache on the IO 87 // The Task posted to PostTaskAndReply in StartClearingDnsCache on the IO
88 // thread. 88 // thread.
89 void ClearDnsCache(IOThread* io_thread) { 89 void ClearDnsCache(IOThread* io_thread) {
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 CallJS("doReload"); 198 CallJS("doReload");
199 } 199 }
200 200
201 void GaiaScreenHandler::DeclareLocalizedValues( 201 void GaiaScreenHandler::DeclareLocalizedValues(
202 LocalizedValuesBuilder* builder) { 202 LocalizedValuesBuilder* builder) {
203 builder->Add("signinScreenTitle", IDS_SIGNIN_SCREEN_TITLE); 203 builder->Add("signinScreenTitle", IDS_SIGNIN_SCREEN_TITLE);
204 builder->Add("signinScreenPasswordChanged", 204 builder->Add("signinScreenPasswordChanged",
205 IDS_SIGNIN_SCREEN_PASSWORD_CHANGED); 205 IDS_SIGNIN_SCREEN_PASSWORD_CHANGED);
206 builder->Add("createAccount", IDS_CREATE_ACCOUNT_HTML); 206 builder->Add("createAccount", IDS_CREATE_ACCOUNT_HTML);
207 builder->Add("guestSignin", IDS_BROWSE_WITHOUT_SIGNING_IN_HTML); 207 builder->Add("guestSignin", IDS_BROWSE_WITHOUT_SIGNING_IN_HTML);
208 builder->Add("createLocallyManagedUser", 208 builder->Add("createSupervisedUser",
209 IDS_CREATE_LOCALLY_MANAGED_USER_HTML); 209 IDS_CREATE_LOCALLY_MANAGED_USER_HTML);
210 builder->Add("createManagedUserFeatureName", 210 builder->Add("createSupervisedUserFeatureName",
211 IDS_CREATE_LOCALLY_MANAGED_USER_FEATURE_NAME); 211 IDS_CREATE_LOCALLY_MANAGED_USER_FEATURE_NAME);
212 212
213 // Strings used by the SAML fatal error dialog. 213 // Strings used by the SAML fatal error dialog.
214 builder->Add("fatalErrorMessageNoEmail", IDS_LOGIN_FATAL_ERROR_NO_EMAIL); 214 builder->Add("fatalErrorMessageNoEmail", IDS_LOGIN_FATAL_ERROR_NO_EMAIL);
215 builder->Add("fatalErrorMessageNoPassword", 215 builder->Add("fatalErrorMessageNoPassword",
216 IDS_LOGIN_FATAL_ERROR_NO_PASSWORD); 216 IDS_LOGIN_FATAL_ERROR_NO_PASSWORD);
217 builder->Add("fatalErrorMessageVerificationFailed", 217 builder->Add("fatalErrorMessageVerificationFailed",
218 IDS_LOGIN_FATAL_ERROR_PASSWORD_VERIFICATION); 218 IDS_LOGIN_FATAL_ERROR_PASSWORD_VERIFICATION);
219 builder->Add("fatalErrorMessageInsecureURL", 219 builder->Add("fatalErrorMessageInsecureURL",
220 IDS_LOGIN_FATAL_ERROR_TEXT_INSECURE_URL); 220 IDS_LOGIN_FATAL_ERROR_TEXT_INSECURE_URL);
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 540
541 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { 541 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
542 DCHECK(signin_screen_handler_); 542 DCHECK(signin_screen_handler_);
543 return signin_screen_handler_->delegate_; 543 return signin_screen_handler_->delegate_;
544 } 544 }
545 545
546 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) { 546 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) {
547 signin_screen_handler_ = handler; 547 signin_screen_handler_ = handler;
548 } 548 }
549 } // namespace chromeos 549 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/sync/sessions/notification_service_sessions_router.h ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698