Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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/gaia_screen_handler.h" | 5 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" |
| 6 | 6 |
| 7 #include "ash/common/system/chromeos/devicetype_utils.h" | 7 #include "ash/common/system/chromeos/devicetype_utils.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/guid.h" | 10 #include "base/guid.h" |
| (...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 541 signin_screen_handler_->RefocusCurrentPod(); | 541 signin_screen_handler_->RefocusCurrentPod(); |
| 542 | 542 |
| 543 frame_error_ = net::OK; | 543 frame_error_ = net::OK; |
| 544 frame_state_ = FRAME_STATE_LOADED; | 544 frame_state_ = FRAME_STATE_LOADED; |
| 545 | 545 |
| 546 if (network_state_informer_->state() == NetworkStateInformer::ONLINE) | 546 if (network_state_informer_->state() == NetworkStateInformer::ONLINE) |
| 547 UpdateState(NetworkError::ERROR_REASON_UPDATE); | 547 UpdateState(NetworkError::ERROR_REASON_UPDATE); |
| 548 | 548 |
| 549 if (test_expects_complete_login_) | 549 if (test_expects_complete_login_) |
| 550 SubmitLoginFormForTest(); | 550 SubmitLoginFormForTest(); |
| 551 if (Delegate()) | |
| 552 Delegate()->OnSigninScreenReady(); | |
|
Alexander Alekseev
2016/11/17 22:49:33
This looks strange. Why do you need this?
Sergey Poromov
2016/11/17 22:55:34
This is needed to notify ExistingUserController th
Nikita (slow)
2016/11/18 15:12:58
Why this change?
Sergey Poromov
2016/11/18 15:47:26
Changed to OnGaiaScreenReady as for auto login it
| |
| 551 } | 553 } |
| 552 | 554 |
| 553 void GaiaScreenHandler::DoCompleteLogin(const std::string& gaia_id, | 555 void GaiaScreenHandler::DoCompleteLogin(const std::string& gaia_id, |
| 554 const std::string& typed_email, | 556 const std::string& typed_email, |
| 555 const std::string& password, | 557 const std::string& password, |
| 556 bool using_saml) { | 558 bool using_saml) { |
| 557 if (!Delegate()) | 559 if (!Delegate()) |
| 558 return; | 560 return; |
| 559 | 561 |
| 560 if (using_saml && !using_saml_api_) | 562 if (using_saml && !using_saml_api_) |
| (...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 839 bool GaiaScreenHandler::IsRestrictiveProxy() const { | 841 bool GaiaScreenHandler::IsRestrictiveProxy() const { |
| 840 return !disable_restrictive_proxy_check_for_test_ && | 842 return !disable_restrictive_proxy_check_for_test_ && |
| 841 !IsOnline(captive_portal_status_); | 843 !IsOnline(captive_portal_status_); |
| 842 } | 844 } |
| 843 | 845 |
| 844 void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() { | 846 void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() { |
| 845 disable_restrictive_proxy_check_for_test_ = true; | 847 disable_restrictive_proxy_check_for_test_ = true; |
| 846 } | 848 } |
| 847 | 849 |
| 848 } // namespace chromeos | 850 } // namespace chromeos |
| OLD | NEW |