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

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

Issue 645003002: Added keyboard shortcut on GAIA "Add User" screen to dogfood GAIA /EmbeddedSignin (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review Created 6 years, 2 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
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h ('k') | ui/login/display_manager.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 80749a84d84cf7600536ed0bc07ea654ee362d29..fed0c18cfd1d2b5ecea284c58781438262b792e1 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -744,6 +744,8 @@ void SigninScreenHandler::RegisterMessages() {
AddCallback("removeUser", &SigninScreenHandler::HandleRemoveUser);
AddCallback("toggleEnrollmentScreen",
&SigninScreenHandler::HandleToggleEnrollmentScreen);
+ AddCallback("switchToEmbeddedSignin",
+ &SigninScreenHandler::HandleSwitchToEmbeddedSignin);
AddCallback("toggleKioskEnableScreen",
&SigninScreenHandler::HandleToggleKioskEnableScreen);
AddCallback("createAccount", &SigninScreenHandler::HandleCreateAccount);
@@ -1319,6 +1321,9 @@ void SigninScreenHandler::HandleLoginUIStateChanged(const std::string& source,
VLOG(0) << "Login WebUI >> active: " << new_value << ", "
<< "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";
@@ -1434,6 +1439,10 @@ void SigninScreenHandler::HandleGetTouchViewState() {
}
}
+void SigninScreenHandler::HandleSwitchToEmbeddedSignin() {
+ gaia_screen_handler_->SwitchToEmbeddedSignin();
+}
+
bool SigninScreenHandler::AllWhitelistedUsersPresent() {
CrosSettings* cros_settings = CrosSettings::Get();
bool allow_new_user = false;
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h ('k') | ui/login/display_manager.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698