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

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

Issue 597523002: Fix crash on login screen for Athena Chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1308 matching lines...) Expand 10 before | Expand all | Expand 10 after
1319 void SigninScreenHandler::HandleShowLoadingTimeoutError() { 1319 void SigninScreenHandler::HandleShowLoadingTimeoutError() {
1320 UpdateState(ErrorScreenActor::ERROR_REASON_LOADING_TIMEOUT); 1320 UpdateState(ErrorScreenActor::ERROR_REASON_LOADING_TIMEOUT);
1321 } 1321 }
1322 1322
1323 void SigninScreenHandler::HandleUpdateOfflineLogin(bool offline_login_active) { 1323 void SigninScreenHandler::HandleUpdateOfflineLogin(bool offline_login_active) {
1324 offline_login_active_ = offline_login_active; 1324 offline_login_active_ = offline_login_active;
1325 } 1325 }
1326 1326
1327 void SigninScreenHandler::HandleFocusPod(const std::string& user_id) { 1327 void SigninScreenHandler::HandleFocusPod(const std::string& user_id) {
1328 SetUserInputMethod(user_id); 1328 SetUserInputMethod(user_id);
1329 #if !defined(USE_ATHENA)
1330 // TODO(dpolukhin): crbug.com/408734.
1329 WallpaperManager::Get()->SetUserWallpaperDelayed(user_id); 1331 WallpaperManager::Get()->SetUserWallpaperDelayed(user_id);
1332 #endif
1330 ScreenlockBridge::Get()->SetFocusedUser(user_id); 1333 ScreenlockBridge::Get()->SetFocusedUser(user_id);
1331 } 1334 }
1332 1335
1333 void SigninScreenHandler::HandleHardlockPod(const std::string& user_id) { 1336 void SigninScreenHandler::HandleHardlockPod(const std::string& user_id) {
1334 SetAuthType(user_id, 1337 SetAuthType(user_id,
1335 ScreenlockBridge::LockHandler::FORCE_OFFLINE_PASSWORD, 1338 ScreenlockBridge::LockHandler::FORCE_OFFLINE_PASSWORD,
1336 base::string16()); 1339 base::string16());
1337 HideUserPodCustomIcon(user_id); 1340 HideUserPodCustomIcon(user_id);
1338 } 1341 }
1339 1342
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
1514 return gaia_screen_handler_->frame_error(); 1517 return gaia_screen_handler_->frame_error();
1515 } 1518 }
1516 1519
1517 void SigninScreenHandler::OnCapsLockChanged(bool enabled) { 1520 void SigninScreenHandler::OnCapsLockChanged(bool enabled) {
1518 caps_lock_enabled_ = enabled; 1521 caps_lock_enabled_ = enabled;
1519 if (page_is_ready()) 1522 if (page_is_ready())
1520 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_); 1523 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_);
1521 } 1524 }
1522 1525
1523 } // namespace chromeos 1526 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698