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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/signin_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 return NULL; 670 return NULL;
671 } 671 }
672 672
673 void SigninScreenHandler::RegisterMessages() { 673 void SigninScreenHandler::RegisterMessages() {
674 AddCallback("authenticateUser", &SigninScreenHandler::HandleAuthenticateUser); 674 AddCallback("authenticateUser", &SigninScreenHandler::HandleAuthenticateUser);
675 AddCallback("attemptUnlock", &SigninScreenHandler::HandleAttemptUnlock); 675 AddCallback("attemptUnlock", &SigninScreenHandler::HandleAttemptUnlock);
676 AddCallback("getUsers", &SigninScreenHandler::HandleGetUsers); 676 AddCallback("getUsers", &SigninScreenHandler::HandleGetUsers);
677 AddCallback("launchDemoUser", &SigninScreenHandler::HandleLaunchDemoUser); 677 AddCallback("launchDemoUser", &SigninScreenHandler::HandleLaunchDemoUser);
678 AddCallback("launchIncognito", &SigninScreenHandler::HandleLaunchIncognito); 678 AddCallback("launchIncognito", &SigninScreenHandler::HandleLaunchIncognito);
679 AddCallback("showLocallyManagedUserCreationScreen", 679 AddCallback("showLocallyManagedUserCreationScreen",
680 &SigninScreenHandler::HandleShowLocallyManagedUserCreationScreen); 680 &SigninScreenHandler::HandleShowSupervisedUserCreationScreen);
681 AddCallback("launchPublicAccount", 681 AddCallback("launchPublicAccount",
682 &SigninScreenHandler::HandleLaunchPublicAccount); 682 &SigninScreenHandler::HandleLaunchPublicAccount);
683 AddRawCallback("offlineLogin", &SigninScreenHandler::HandleOfflineLogin); 683 AddRawCallback("offlineLogin", &SigninScreenHandler::HandleOfflineLogin);
684 AddCallback("rebootSystem", &SigninScreenHandler::HandleRebootSystem); 684 AddCallback("rebootSystem", &SigninScreenHandler::HandleRebootSystem);
685 AddRawCallback("showAddUser", &SigninScreenHandler::HandleShowAddUser); 685 AddRawCallback("showAddUser", &SigninScreenHandler::HandleShowAddUser);
686 AddCallback("shutdownSystem", &SigninScreenHandler::HandleShutdownSystem); 686 AddCallback("shutdownSystem", &SigninScreenHandler::HandleShutdownSystem);
687 AddCallback("loadWallpaper", &SigninScreenHandler::HandleLoadWallpaper); 687 AddCallback("loadWallpaper", &SigninScreenHandler::HandleLoadWallpaper);
688 AddCallback("removeUser", &SigninScreenHandler::HandleRemoveUser); 688 AddCallback("removeUser", &SigninScreenHandler::HandleRemoveUser);
689 AddCallback("toggleEnrollmentScreen", 689 AddCallback("toggleEnrollmentScreen",
690 &SigninScreenHandler::HandleToggleEnrollmentScreen); 690 &SigninScreenHandler::HandleToggleEnrollmentScreen);
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
995 if (delegate_) 995 if (delegate_)
996 delegate_->Login(context, SigninSpecifics()); 996 delegate_->Login(context, SigninSpecifics());
997 } 997 }
998 998
999 void SigninScreenHandler::HandleLaunchIncognito() { 999 void SigninScreenHandler::HandleLaunchIncognito() {
1000 UserContext context(user_manager::USER_TYPE_GUEST, std::string()); 1000 UserContext context(user_manager::USER_TYPE_GUEST, std::string());
1001 if (delegate_) 1001 if (delegate_)
1002 delegate_->Login(context, SigninSpecifics()); 1002 delegate_->Login(context, SigninSpecifics());
1003 } 1003 }
1004 1004
1005 void SigninScreenHandler::HandleShowLocallyManagedUserCreationScreen() { 1005 void SigninScreenHandler::HandleShowSupervisedUserCreationScreen() {
1006 if (!UserManager::Get()->AreLocallyManagedUsersAllowed()) { 1006 if (!UserManager::Get()->AreSupervisedUsersAllowed()) {
1007 LOG(ERROR) << "Managed users not allowed."; 1007 LOG(ERROR) << "Managed users not allowed.";
1008 return; 1008 return;
1009 } 1009 }
1010 scoped_ptr<base::DictionaryValue> params(new base::DictionaryValue()); 1010 scoped_ptr<base::DictionaryValue> params(new base::DictionaryValue());
1011 LoginDisplayHostImpl::default_host()-> 1011 LoginDisplayHostImpl::default_host()->
1012 StartWizard(WizardController::kLocallyManagedUserCreationScreenName, 1012 StartWizard(WizardController::kSupervisedUserCreationScreenName,
1013 params.Pass()); 1013 params.Pass());
1014 } 1014 }
1015 1015
1016 void SigninScreenHandler::HandleLaunchPublicAccount( 1016 void SigninScreenHandler::HandleLaunchPublicAccount(
1017 const std::string& username) { 1017 const std::string& username) {
1018 UserContext context(user_manager::USER_TYPE_PUBLIC_ACCOUNT, username); 1018 UserContext context(user_manager::USER_TYPE_PUBLIC_ACCOUNT, username);
1019 if (delegate_) 1019 if (delegate_)
1020 delegate_->Login(context, SigninSpecifics()); 1020 delegate_->Login(context, SigninSpecifics());
1021 } 1021 }
1022 1022
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
1378 return gaia_screen_handler_->frame_error(); 1378 return gaia_screen_handler_->frame_error();
1379 } 1379 }
1380 1380
1381 void SigninScreenHandler::OnCapsLockChanged(bool enabled) { 1381 void SigninScreenHandler::OnCapsLockChanged(bool enabled) {
1382 caps_lock_enabled_ = enabled; 1382 caps_lock_enabled_ = enabled;
1383 if (page_is_ready()) 1383 if (page_is_ready())
1384 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_); 1384 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_);
1385 } 1385 }
1386 1386
1387 } // namespace chromeos 1387 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698