| 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 c5dc415c54f17b02dcb4a4e58f655c8873758a33..0caf2cb8e2b3e6b2b9a494c89912e22ee7f07352 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| @@ -461,8 +461,6 @@ void SigninScreenHandler::RegisterMessages() {
|
| &SigninScreenHandler::HandleToggleEnrollmentScreen);
|
| AddCallback("toggleEnableDebuggingScreen",
|
| &SigninScreenHandler::HandleToggleEnableDebuggingScreen);
|
| - AddCallback("switchToEmbeddedSignin",
|
| - &SigninScreenHandler::HandleSwitchToEmbeddedSignin);
|
| AddCallback("toggleKioskEnableScreen",
|
| &SigninScreenHandler::HandleToggleKioskEnableScreen);
|
| AddCallback("createAccount", &SigninScreenHandler::HandleCreateAccount);
|
| @@ -1178,13 +1176,10 @@ void SigninScreenHandler::HandleResyncUserData() {
|
| }
|
|
|
| void SigninScreenHandler::HandleLoginUIStateChanged(const std::string& source,
|
| - bool new_value) {
|
| - VLOG(0) << "Login WebUI >> active: " << new_value << ", "
|
| + bool active) {
|
| + VLOG(0) << "Login WebUI >> active: " << active << ", "
|
| << "source: " << source;
|
|
|
| - if (source == "gaia-signin" && !new_value)
|
| - gaia_screen_handler_->CancelEmbeddedSignin();
|
| -
|
| if (!KioskAppManager::Get()->GetAutoLaunchApp().empty() &&
|
| KioskAppManager::Get()->IsAutoLaunchRequested()) {
|
| VLOG(0) << "Showing auto-launch warning";
|
| @@ -1276,10 +1271,6 @@ void SigninScreenHandler::HandleGetTouchViewState() {
|
| }
|
| }
|
|
|
| -void SigninScreenHandler::HandleSwitchToEmbeddedSignin() {
|
| - gaia_screen_handler_->SwitchToEmbeddedSignin();
|
| -}
|
| -
|
| bool SigninScreenHandler::AllWhitelistedUsersPresent() {
|
| CrosSettings* cros_settings = CrosSettings::Get();
|
| bool allow_new_user = false;
|
|
|