| 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/chromeos/login/managed/locally_managed_user_creation_sc
reen.h" | 5 #include "chrome/browser/chromeos/login/managed/locally_managed_user_creation_sc
reen.h" |
| 6 | 6 |
| 7 #include "chrome/browser/chromeos/login/existing_user_controller.h" | 7 #include "chrome/browser/chromeos/login/existing_user_controller.h" |
| 8 #include "chrome/browser/chromeos/login/managed/locally_managed_user_controller.
h" | 8 #include "chrome/browser/chromeos/login/managed/locally_managed_user_controller.
h" |
| 9 #include "chrome/browser/chromeos/login/screen_observer.h" | 9 #include "chrome/browser/chromeos/login/screen_observer.h" |
| 10 #include "chrome/browser/chromeos/login/wizard_controller.h" | 10 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 std::string& managed_user_password, | 81 std::string& managed_user_password, |
| 82 std::string& manager_id, | 82 std::string& manager_id, |
| 83 std::string& manager_password) { | 83 std::string& manager_password) { |
| 84 | 84 |
| 85 // Make sure no two controllers exist at the same time. | 85 // Make sure no two controllers exist at the same time. |
| 86 controller_.reset(); | 86 controller_.reset(); |
| 87 controller_.reset(new LocallyManagedUserController(this)); | 87 controller_.reset(new LocallyManagedUserController(this)); |
| 88 controller_->SetUpCreation(display_name, managed_user_password); | 88 controller_->SetUpCreation(display_name, managed_user_password); |
| 89 | 89 |
| 90 ExistingUserController::current_controller()-> | 90 ExistingUserController::current_controller()-> |
| 91 Login(manager_id, manager_password); | 91 Login(UserCredentials(manager_id, |
| 92 manager_password, |
| 93 std::string() /* auth_code */)); |
| 92 } | 94 } |
| 93 | 95 |
| 94 void LocallyManagedUserCreationScreen::OnManagerLoginFailure() { | 96 void LocallyManagedUserCreationScreen::OnManagerLoginFailure() { |
| 95 if (actor_) | 97 if (actor_) |
| 96 actor_->ShowManagerPasswordError(); | 98 actor_->ShowManagerPasswordError(); |
| 97 } | 99 } |
| 98 | 100 |
| 99 void LocallyManagedUserCreationScreen::OnManagerSignIn() { | 101 void LocallyManagedUserCreationScreen::OnManagerSignIn() { |
| 100 if (actor_) | 102 if (actor_) |
| 101 actor_->ShowProgressScreen(); | 103 actor_->ShowProgressScreen(); |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 if (actor_) | 143 if (actor_) |
| 142 actor_->ShowErrorMessage(message, recoverable); | 144 actor_->ShowErrorMessage(message, recoverable); |
| 143 } | 145 } |
| 144 | 146 |
| 145 void LocallyManagedUserCreationScreen::OnCreationSuccess() { | 147 void LocallyManagedUserCreationScreen::OnCreationSuccess() { |
| 146 if (actor_) | 148 if (actor_) |
| 147 actor_->ShowSuccessMessage(); | 149 actor_->ShowSuccessMessage(); |
| 148 } | 150 } |
| 149 | 151 |
| 150 } // namespace chromeos | 152 } // namespace chromeos |
| OLD | NEW |