| OLD | NEW |
| 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 593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 604 DCHECK(gaia_screen_handler_); | 604 DCHECK(gaia_screen_handler_); |
| 605 gaia_screen_handler_->CancelShowGaiaAsync(); | 605 gaia_screen_handler_->CancelShowGaiaAsync(); |
| 606 ShowScreen(OobeUI::kScreenAccountPicker, params); | 606 ShowScreen(OobeUI::kScreenAccountPicker, params); |
| 607 break; | 607 break; |
| 608 default: | 608 default: |
| 609 NOTREACHED(); | 609 NOTREACHED(); |
| 610 break; | 610 break; |
| 611 } | 611 } |
| 612 } | 612 } |
| 613 | 613 |
| 614 // TODO(ygorshenin@): split this method into small parts. | 614 // TODO(antrim@): split this method into small parts. |
| 615 // TODO(ygorshenin@): move this logic to GaiaScreenHandler. | 615 // TODO(antrim@): move this logic to GaiaScreenHandler. |
| 616 void SigninScreenHandler::UpdateStateInternal(NetworkError::ErrorReason reason, | 616 void SigninScreenHandler::UpdateStateInternal(NetworkError::ErrorReason reason, |
| 617 bool force_update) { | 617 bool force_update) { |
| 618 // Do nothing once user has signed in or sign in is in progress. | 618 // Do nothing once user has signed in or sign in is in progress. |
| 619 // TODO(ygorshenin): We will end up here when processing network state | 619 // TODO(antrim): We will end up here when processing network state |
| 620 // notification but no ShowSigninScreen() was called so delegate_ will be | 620 // notification but no ShowSigninScreen() was called so delegate_ will be |
| 621 // NULL. Network state processing logic does not belong here. | 621 // NULL. Network state processing logic does not belong here. |
| 622 if (delegate_ && | 622 if (delegate_ && |
| 623 (delegate_->IsUserSigninCompleted() || delegate_->IsSigninInProgress())) { | 623 (delegate_->IsUserSigninCompleted() || delegate_->IsSigninInProgress())) { |
| 624 return; | 624 return; |
| 625 } | 625 } |
| 626 | 626 |
| 627 NetworkStateInformer::State state = network_state_informer_->state(); | 627 NetworkStateInformer::State state = network_state_informer_->state(); |
| 628 const std::string network_path = network_state_informer_->network_path(); | 628 const std::string network_path = network_state_informer_->network_path(); |
| 629 const std::string network_name = GetNetworkName(network_path); | 629 const std::string network_name = GetNetworkName(network_path); |
| (...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1377 return gaia_screen_handler_->frame_error(); | 1377 return gaia_screen_handler_->frame_error(); |
| 1378 } | 1378 } |
| 1379 | 1379 |
| 1380 void SigninScreenHandler::OnCapsLockChanged(bool enabled) { | 1380 void SigninScreenHandler::OnCapsLockChanged(bool enabled) { |
| 1381 caps_lock_enabled_ = enabled; | 1381 caps_lock_enabled_ = enabled; |
| 1382 if (page_is_ready()) | 1382 if (page_is_ready()) |
| 1383 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_); | 1383 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_); |
| 1384 } | 1384 } |
| 1385 | 1385 |
| 1386 } // namespace chromeos | 1386 } // namespace chromeos |
| OLD | NEW |