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/chromeos/login/wizard_controller.h" | 5 #include "chrome/browser/chromeos/login/wizard_controller.h" |
6 | 6 |
7 #include <signal.h> | 7 #include <signal.h> |
8 #include <stdlib.h> | 8 #include <stdlib.h> |
9 #include <sys/types.h> | 9 #include <sys/types.h> |
10 | 10 |
(...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
670 base::TimeDelta::FromSeconds(kResolveTimeZoneTimeoutSeconds), | 670 base::TimeDelta::FromSeconds(kResolveTimeZoneTimeoutSeconds), |
671 base::Bind(&WizardController::OnLocationResolved, | 671 base::Bind(&WizardController::OnLocationResolved, |
672 weak_factory_.GetWeakPtr())); | 672 weak_factory_.GetWeakPtr())); |
673 } | 673 } |
674 | 674 |
675 void WizardController::PerformPostEulaActions() { | 675 void WizardController::PerformPostEulaActions() { |
676 DelayNetworkCall( | 676 DelayNetworkCall( |
677 base::Bind(&WizardController::StartTimezoneResolve, | 677 base::Bind(&WizardController::StartTimezoneResolve, |
678 weak_factory_.GetWeakPtr()), | 678 weak_factory_.GetWeakPtr()), |
679 base::TimeDelta::FromMilliseconds(kDefaultNetworkRetryDelayMS)); | 679 base::TimeDelta::FromMilliseconds(kDefaultNetworkRetryDelayMS)); |
| 680 DelayNetworkCall( |
| 681 ServicesCustomizationDocument::GetInstance() |
| 682 ->EnsureCustomizationAppliedClosure(), |
| 683 base::TimeDelta::FromMilliseconds(kDefaultNetworkRetryDelayMS)); |
680 | 684 |
681 // Now that EULA has been accepted (for official builds), enable portal check. | 685 // Now that EULA has been accepted (for official builds), enable portal check. |
682 // ChromiumOS builds would go though this code path too. | 686 // ChromiumOS builds would go though this code path too. |
683 NetworkHandler::Get()->network_state_handler()->SetCheckPortalList( | 687 NetworkHandler::Get()->network_state_handler()->SetCheckPortalList( |
684 NetworkStateHandler::kDefaultCheckPortalList); | 688 NetworkStateHandler::kDefaultCheckPortalList); |
685 host_->GetAutoEnrollmentController()->Start(); | 689 host_->GetAutoEnrollmentController()->Start(); |
686 host_->PrewarmAuthentication(); | 690 host_->PrewarmAuthentication(); |
687 NetworkPortalDetector::Get()->Enable(true); | 691 NetworkPortalDetector::Get()->Enable(true); |
688 } | 692 } |
689 | 693 |
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1036 // cancelled on destruction. | 1040 // cancelled on destruction. |
1037 GetTimezoneProvider()->RequestTimezone( | 1041 GetTimezoneProvider()->RequestTimezone( |
1038 position, | 1042 position, |
1039 false, // sensor | 1043 false, // sensor |
1040 timeout - elapsed, | 1044 timeout - elapsed, |
1041 base::Bind(&WizardController::OnTimezoneResolved, | 1045 base::Bind(&WizardController::OnTimezoneResolved, |
1042 base::Unretained(this))); | 1046 base::Unretained(this))); |
1043 } | 1047 } |
1044 | 1048 |
1045 } // namespace chromeos | 1049 } // namespace chromeos |
OLD | NEW |