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

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

Issue 1018133002: [cleanup] Removed embedded sign-in support code from OOBE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 AddRawCallback("offlineLogin", &SigninScreenHandler::HandleOfflineLogin); 454 AddRawCallback("offlineLogin", &SigninScreenHandler::HandleOfflineLogin);
455 AddCallback("rebootSystem", &SigninScreenHandler::HandleRebootSystem); 455 AddCallback("rebootSystem", &SigninScreenHandler::HandleRebootSystem);
456 AddRawCallback("showAddUser", &SigninScreenHandler::HandleShowAddUser); 456 AddRawCallback("showAddUser", &SigninScreenHandler::HandleShowAddUser);
457 AddCallback("shutdownSystem", &SigninScreenHandler::HandleShutdownSystem); 457 AddCallback("shutdownSystem", &SigninScreenHandler::HandleShutdownSystem);
458 AddCallback("loadWallpaper", &SigninScreenHandler::HandleLoadWallpaper); 458 AddCallback("loadWallpaper", &SigninScreenHandler::HandleLoadWallpaper);
459 AddCallback("removeUser", &SigninScreenHandler::HandleRemoveUser); 459 AddCallback("removeUser", &SigninScreenHandler::HandleRemoveUser);
460 AddCallback("toggleEnrollmentScreen", 460 AddCallback("toggleEnrollmentScreen",
461 &SigninScreenHandler::HandleToggleEnrollmentScreen); 461 &SigninScreenHandler::HandleToggleEnrollmentScreen);
462 AddCallback("toggleEnableDebuggingScreen", 462 AddCallback("toggleEnableDebuggingScreen",
463 &SigninScreenHandler::HandleToggleEnableDebuggingScreen); 463 &SigninScreenHandler::HandleToggleEnableDebuggingScreen);
464 AddCallback("switchToEmbeddedSignin",
465 &SigninScreenHandler::HandleSwitchToEmbeddedSignin);
466 AddCallback("toggleKioskEnableScreen", 464 AddCallback("toggleKioskEnableScreen",
467 &SigninScreenHandler::HandleToggleKioskEnableScreen); 465 &SigninScreenHandler::HandleToggleKioskEnableScreen);
468 AddCallback("createAccount", &SigninScreenHandler::HandleCreateAccount); 466 AddCallback("createAccount", &SigninScreenHandler::HandleCreateAccount);
469 AddCallback("accountPickerReady", 467 AddCallback("accountPickerReady",
470 &SigninScreenHandler::HandleAccountPickerReady); 468 &SigninScreenHandler::HandleAccountPickerReady);
471 AddCallback("wallpaperReady", &SigninScreenHandler::HandleWallpaperReady); 469 AddCallback("wallpaperReady", &SigninScreenHandler::HandleWallpaperReady);
472 AddCallback("signOutUser", &SigninScreenHandler::HandleSignOutUser); 470 AddCallback("signOutUser", &SigninScreenHandler::HandleSignOutUser);
473 AddCallback("openProxySettings", 471 AddCallback("openProxySettings",
474 &SigninScreenHandler::HandleOpenProxySettings); 472 &SigninScreenHandler::HandleOpenProxySettings);
475 AddCallback("loginVisible", &SigninScreenHandler::HandleLoginVisible); 473 AddCallback("loginVisible", &SigninScreenHandler::HandleLoginVisible);
(...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
1171 if (delegate_) 1169 if (delegate_)
1172 delegate_->MigrateUserData(old_password); 1170 delegate_->MigrateUserData(old_password);
1173 } 1171 }
1174 1172
1175 void SigninScreenHandler::HandleResyncUserData() { 1173 void SigninScreenHandler::HandleResyncUserData() {
1176 if (delegate_) 1174 if (delegate_)
1177 delegate_->ResyncUserData(); 1175 delegate_->ResyncUserData();
1178 } 1176 }
1179 1177
1180 void SigninScreenHandler::HandleLoginUIStateChanged(const std::string& source, 1178 void SigninScreenHandler::HandleLoginUIStateChanged(const std::string& source,
1181 bool new_value) { 1179 bool active) {
1182 VLOG(0) << "Login WebUI >> active: " << new_value << ", " 1180 VLOG(0) << "Login WebUI >> active: " << active << ", "
1183 << "source: " << source; 1181 << "source: " << source;
1184 1182
1185 if (source == "gaia-signin" && !new_value)
1186 gaia_screen_handler_->CancelEmbeddedSignin();
1187
1188 if (!KioskAppManager::Get()->GetAutoLaunchApp().empty() && 1183 if (!KioskAppManager::Get()->GetAutoLaunchApp().empty() &&
1189 KioskAppManager::Get()->IsAutoLaunchRequested()) { 1184 KioskAppManager::Get()->IsAutoLaunchRequested()) {
1190 VLOG(0) << "Showing auto-launch warning"; 1185 VLOG(0) << "Showing auto-launch warning";
1191 // On slow devices, the wallpaper animation is not shown initially, so we 1186 // On slow devices, the wallpaper animation is not shown initially, so we
1192 // must explicitly load the wallpaper. This is also the case for the 1187 // must explicitly load the wallpaper. This is also the case for the
1193 // account-picker and gaia-signin UI states. 1188 // account-picker and gaia-signin UI states.
1194 delegate_->LoadSigninWallpaper(); 1189 delegate_->LoadSigninWallpaper();
1195 HandleToggleKioskAutolaunchScreen(); 1190 HandleToggleKioskAutolaunchScreen();
1196 return; 1191 return;
1197 } 1192 }
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
1269 ShowImpl(); 1264 ShowImpl();
1270 } 1265 }
1271 1266
1272 void SigninScreenHandler::HandleGetTouchViewState() { 1267 void SigninScreenHandler::HandleGetTouchViewState() {
1273 if (max_mode_delegate_) { 1268 if (max_mode_delegate_) {
1274 CallJS("login.AccountPickerScreen.setTouchViewState", 1269 CallJS("login.AccountPickerScreen.setTouchViewState",
1275 max_mode_delegate_->IsMaximizeModeEnabled()); 1270 max_mode_delegate_->IsMaximizeModeEnabled());
1276 } 1271 }
1277 } 1272 }
1278 1273
1279 void SigninScreenHandler::HandleSwitchToEmbeddedSignin() {
1280 gaia_screen_handler_->SwitchToEmbeddedSignin();
1281 }
1282
1283 bool SigninScreenHandler::AllWhitelistedUsersPresent() { 1274 bool SigninScreenHandler::AllWhitelistedUsersPresent() {
1284 CrosSettings* cros_settings = CrosSettings::Get(); 1275 CrosSettings* cros_settings = CrosSettings::Get();
1285 bool allow_new_user = false; 1276 bool allow_new_user = false;
1286 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user); 1277 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
1287 if (allow_new_user) 1278 if (allow_new_user)
1288 return false; 1279 return false;
1289 user_manager::UserManager* user_manager = user_manager::UserManager::Get(); 1280 user_manager::UserManager* user_manager = user_manager::UserManager::Get();
1290 const user_manager::UserList& users = user_manager->GetUsers(); 1281 const user_manager::UserList& users = user_manager->GetUsers();
1291 if (!delegate_ || users.size() > kMaxUsers) { 1282 if (!delegate_ || users.size() > kMaxUsers) {
1292 return false; 1283 return false;
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
1370 return gaia_screen_handler_->frame_error(); 1361 return gaia_screen_handler_->frame_error();
1371 } 1362 }
1372 1363
1373 void SigninScreenHandler::OnCapsLockChanged(bool enabled) { 1364 void SigninScreenHandler::OnCapsLockChanged(bool enabled) {
1374 caps_lock_enabled_ = enabled; 1365 caps_lock_enabled_ = enabled;
1375 if (page_is_ready()) 1366 if (page_is_ready())
1376 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_); 1367 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_);
1377 } 1368 }
1378 1369
1379 } // namespace chromeos 1370 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698