OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/enrollment_screen_handler.h" | 5 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ash/common/system/chromeos/devicetype_utils.h" | 9 #include "ash/common/system/chromeos/devicetype_utils.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
578 password_fd.get(), | 578 password_fd.get(), |
579 base::Bind(&EnrollmentScreenHandler::HandleAdDomainJoin, | 579 base::Bind(&EnrollmentScreenHandler::HandleAdDomainJoin, |
580 weak_ptr_factory_.GetWeakPtr(), | 580 weak_ptr_factory_.GetWeakPtr(), |
581 machine_name, | 581 machine_name, |
582 user_name)); | 582 user_name)); |
583 } | 583 } |
584 | 584 |
585 void EnrollmentScreenHandler::HandleAdDomainJoin( | 585 void EnrollmentScreenHandler::HandleAdDomainJoin( |
586 const std::string& machine_name, | 586 const std::string& machine_name, |
587 const std::string& user_name, | 587 const std::string& user_name, |
588 int code) { | 588 authpolicy::ADJoinErrorType code) { |
Alexander Alekseev
2016/12/21 14:45:30
nit: please document here that code may be outside
stevenjb
2016/12/21 18:12:11
authpolicy::ADJoinErrorType is a DBus constant, so
Roman Sorokin (ftl)
2016/12/23 10:03:04
I added _COUNT member to the enum and check if the
| |
589 if (code == 0) { | 589 switch (code) { |
590 controller_->OnAdJoined(gaia::ExtractDomainName(user_name)); | 590 case authpolicy::AD_JOIN_ERROR_NONE: |
591 return; | 591 controller_->OnAdJoined(gaia::ExtractDomainName(user_name)); |
592 return; | |
593 default: | |
594 // TODO(rsorokin): Add passing/displaying error codes. (see | |
595 // crbug.com/659984) | |
596 CallJS("invalidateAd", machine_name, user_name); | |
592 } | 597 } |
593 // TODO(rsorokin): Add passing/displaying error codes. (see crbug.com/659984) | |
594 CallJS("invalidateAd", machine_name, user_name); | |
595 } | 598 } |
596 | 599 |
597 void EnrollmentScreenHandler::HandleRetry() { | 600 void EnrollmentScreenHandler::HandleRetry() { |
598 DCHECK(controller_); | 601 DCHECK(controller_); |
599 controller_->OnRetry(); | 602 controller_->OnRetry(); |
600 } | 603 } |
601 | 604 |
602 void EnrollmentScreenHandler::HandleFrameLoadingCompleted() { | 605 void EnrollmentScreenHandler::HandleFrameLoadingCompleted() { |
603 if (network_state_informer_->state() != NetworkStateInformer::ONLINE) | 606 if (network_state_informer_->state() != NetworkStateInformer::ONLINE) |
604 return; | 607 return; |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
655 | 658 |
656 ShowScreenWithData(OobeScreen::SCREEN_OOBE_ENROLLMENT, &screen_data); | 659 ShowScreenWithData(OobeScreen::SCREEN_OOBE_ENROLLMENT, &screen_data); |
657 if (first_show_) { | 660 if (first_show_) { |
658 first_show_ = false; | 661 first_show_ = false; |
659 UpdateStateInternal(NetworkError::ERROR_REASON_UPDATE, true); | 662 UpdateStateInternal(NetworkError::ERROR_REASON_UPDATE, true); |
660 } | 663 } |
661 histogram_helper_->OnScreenShow(); | 664 histogram_helper_->OnScreenShow(); |
662 } | 665 } |
663 | 666 |
664 } // namespace chromeos | 667 } // namespace chromeos |
OLD | NEW |