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

Side by Side 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 unified diff | Download patch
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 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 AddCallback("launchPublicSession", 737 AddCallback("launchPublicSession",
738 &SigninScreenHandler::HandleLaunchPublicSession); 738 &SigninScreenHandler::HandleLaunchPublicSession);
739 AddRawCallback("offlineLogin", &SigninScreenHandler::HandleOfflineLogin); 739 AddRawCallback("offlineLogin", &SigninScreenHandler::HandleOfflineLogin);
740 AddCallback("rebootSystem", &SigninScreenHandler::HandleRebootSystem); 740 AddCallback("rebootSystem", &SigninScreenHandler::HandleRebootSystem);
741 AddRawCallback("showAddUser", &SigninScreenHandler::HandleShowAddUser); 741 AddRawCallback("showAddUser", &SigninScreenHandler::HandleShowAddUser);
742 AddCallback("shutdownSystem", &SigninScreenHandler::HandleShutdownSystem); 742 AddCallback("shutdownSystem", &SigninScreenHandler::HandleShutdownSystem);
743 AddCallback("loadWallpaper", &SigninScreenHandler::HandleLoadWallpaper); 743 AddCallback("loadWallpaper", &SigninScreenHandler::HandleLoadWallpaper);
744 AddCallback("removeUser", &SigninScreenHandler::HandleRemoveUser); 744 AddCallback("removeUser", &SigninScreenHandler::HandleRemoveUser);
745 AddCallback("toggleEnrollmentScreen", 745 AddCallback("toggleEnrollmentScreen",
746 &SigninScreenHandler::HandleToggleEnrollmentScreen); 746 &SigninScreenHandler::HandleToggleEnrollmentScreen);
747 AddCallback("switchToEmbeddedSignin",
748 &SigninScreenHandler::HandleSwitchToEmbeddedSignin);
747 AddCallback("toggleKioskEnableScreen", 749 AddCallback("toggleKioskEnableScreen",
748 &SigninScreenHandler::HandleToggleKioskEnableScreen); 750 &SigninScreenHandler::HandleToggleKioskEnableScreen);
749 AddCallback("createAccount", &SigninScreenHandler::HandleCreateAccount); 751 AddCallback("createAccount", &SigninScreenHandler::HandleCreateAccount);
750 AddCallback("accountPickerReady", 752 AddCallback("accountPickerReady",
751 &SigninScreenHandler::HandleAccountPickerReady); 753 &SigninScreenHandler::HandleAccountPickerReady);
752 AddCallback("wallpaperReady", &SigninScreenHandler::HandleWallpaperReady); 754 AddCallback("wallpaperReady", &SigninScreenHandler::HandleWallpaperReady);
753 AddCallback("signOutUser", &SigninScreenHandler::HandleSignOutUser); 755 AddCallback("signOutUser", &SigninScreenHandler::HandleSignOutUser);
754 AddCallback("openProxySettings", 756 AddCallback("openProxySettings",
755 &SigninScreenHandler::HandleOpenProxySettings); 757 &SigninScreenHandler::HandleOpenProxySettings);
756 AddCallback("loginVisible", &SigninScreenHandler::HandleLoginVisible); 758 AddCallback("loginVisible", &SigninScreenHandler::HandleLoginVisible);
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
1312 void SigninScreenHandler::HandleResyncUserData() { 1314 void SigninScreenHandler::HandleResyncUserData() {
1313 if (delegate_) 1315 if (delegate_)
1314 delegate_->ResyncUserData(); 1316 delegate_->ResyncUserData();
1315 } 1317 }
1316 1318
1317 void SigninScreenHandler::HandleLoginUIStateChanged(const std::string& source, 1319 void SigninScreenHandler::HandleLoginUIStateChanged(const std::string& source,
1318 bool new_value) { 1320 bool new_value) {
1319 VLOG(0) << "Login WebUI >> active: " << new_value << ", " 1321 VLOG(0) << "Login WebUI >> active: " << new_value << ", "
1320 << "source: " << source; 1322 << "source: " << source;
1321 1323
1324 if (source == "gaia-signin" && !new_value)
1325 gaia_screen_handler_->CancelEmbeddedSignin();
1326
1322 if (!KioskAppManager::Get()->GetAutoLaunchApp().empty() && 1327 if (!KioskAppManager::Get()->GetAutoLaunchApp().empty() &&
1323 KioskAppManager::Get()->IsAutoLaunchRequested()) { 1328 KioskAppManager::Get()->IsAutoLaunchRequested()) {
1324 VLOG(0) << "Showing auto-launch warning"; 1329 VLOG(0) << "Showing auto-launch warning";
1325 // On slow devices, the wallpaper animation is not shown initially, so we 1330 // On slow devices, the wallpaper animation is not shown initially, so we
1326 // must explicitly load the wallpaper. This is also the case for the 1331 // must explicitly load the wallpaper. This is also the case for the
1327 // account-picker and gaia-signin UI states. 1332 // account-picker and gaia-signin UI states.
1328 delegate_->LoadSigninWallpaper(); 1333 delegate_->LoadSigninWallpaper();
1329 HandleToggleKioskAutolaunchScreen(); 1334 HandleToggleKioskAutolaunchScreen();
1330 return; 1335 return;
1331 } 1336 }
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
1427 ShowImpl(); 1432 ShowImpl();
1428 } 1433 }
1429 1434
1430 void SigninScreenHandler::HandleGetTouchViewState() { 1435 void SigninScreenHandler::HandleGetTouchViewState() {
1431 if (max_mode_delegate_) { 1436 if (max_mode_delegate_) {
1432 CallJS("login.AccountPickerScreen.setTouchViewState", 1437 CallJS("login.AccountPickerScreen.setTouchViewState",
1433 max_mode_delegate_->IsMaximizeModeEnabled()); 1438 max_mode_delegate_->IsMaximizeModeEnabled());
1434 } 1439 }
1435 } 1440 }
1436 1441
1442 void SigninScreenHandler::HandleSwitchToEmbeddedSignin() {
1443 gaia_screen_handler_->SwitchToEmbeddedSignin();
1444 }
1445
1437 bool SigninScreenHandler::AllWhitelistedUsersPresent() { 1446 bool SigninScreenHandler::AllWhitelistedUsersPresent() {
1438 CrosSettings* cros_settings = CrosSettings::Get(); 1447 CrosSettings* cros_settings = CrosSettings::Get();
1439 bool allow_new_user = false; 1448 bool allow_new_user = false;
1440 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user); 1449 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
1441 if (allow_new_user) 1450 if (allow_new_user)
1442 return false; 1451 return false;
1443 user_manager::UserManager* user_manager = user_manager::UserManager::Get(); 1452 user_manager::UserManager* user_manager = user_manager::UserManager::Get();
1444 const user_manager::UserList& users = user_manager->GetUsers(); 1453 const user_manager::UserList& users = user_manager->GetUsers();
1445 if (!delegate_ || users.size() > kMaxUsers) { 1454 if (!delegate_ || users.size() > kMaxUsers) {
1446 return false; 1455 return false;
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
1587 return gaia_screen_handler_->frame_error(); 1596 return gaia_screen_handler_->frame_error();
1588 } 1597 }
1589 1598
1590 void SigninScreenHandler::OnCapsLockChanged(bool enabled) { 1599 void SigninScreenHandler::OnCapsLockChanged(bool enabled) {
1591 caps_lock_enabled_ = enabled; 1600 caps_lock_enabled_ = enabled;
1592 if (page_is_ready()) 1601 if (page_is_ready())
1593 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_); 1602 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_);
1594 } 1603 }
1595 1604
1596 } // namespace chromeos 1605 } // namespace chromeos
OLDNEW
« 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