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

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

Issue 393343002: Rename "managed (mode|user)" to "supervised user" (part 7) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more alphabetize (and rebase again) Created 6 years, 5 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 c9f8793249d7929e6cf9ac4ebef5a1b420c888fe..88063e8506f66ea8f10864a413e294016166cbad 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -677,7 +677,7 @@ void SigninScreenHandler::RegisterMessages() {
AddCallback("launchDemoUser", &SigninScreenHandler::HandleLaunchDemoUser);
AddCallback("launchIncognito", &SigninScreenHandler::HandleLaunchIncognito);
AddCallback("showLocallyManagedUserCreationScreen",
- &SigninScreenHandler::HandleShowLocallyManagedUserCreationScreen);
+ &SigninScreenHandler::HandleShowSupervisedUserCreationScreen);
AddCallback("launchPublicAccount",
&SigninScreenHandler::HandleLaunchPublicAccount);
AddRawCallback("offlineLogin", &SigninScreenHandler::HandleOfflineLogin);
@@ -1002,14 +1002,14 @@ void SigninScreenHandler::HandleLaunchIncognito() {
delegate_->Login(context, SigninSpecifics());
}
-void SigninScreenHandler::HandleShowLocallyManagedUserCreationScreen() {
- if (!UserManager::Get()->AreLocallyManagedUsersAllowed()) {
+void SigninScreenHandler::HandleShowSupervisedUserCreationScreen() {
+ if (!UserManager::Get()->AreSupervisedUsersAllowed()) {
LOG(ERROR) << "Managed users not allowed.";
return;
}
scoped_ptr<base::DictionaryValue> params(new base::DictionaryValue());
LoginDisplayHostImpl::default_host()->
- StartWizard(WizardController::kLocallyManagedUserCreationScreenName,
+ StartWizard(WizardController::kSupervisedUserCreationScreenName,
params.Pass());
}

Powered by Google App Engine
This is Rietveld 408576698