Chromium Code Reviews| 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/existing_user_controller.h" | 5 #include "chrome/browser/chromeos/login/existing_user_controller.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 433 | 433 |
| 434 if (!user_context.HasCredentials()) { | 434 if (!user_context.HasCredentials()) { |
| 435 // For easy unlock auth, login UI gets disabled prior to attempting login. | 435 // For easy unlock auth, login UI gets disabled prior to attempting login. |
| 436 if (user_context.GetAuthFlow() == UserContext::AUTH_FLOW_EASY_UNLOCK) | 436 if (user_context.GetAuthFlow() == UserContext::AUTH_FLOW_EASY_UNLOCK) |
| 437 login_display_->SetUIEnabled(true); | 437 login_display_->SetUIEnabled(true); |
| 438 return; | 438 return; |
| 439 } | 439 } |
| 440 | 440 |
| 441 PerformPreLoginActions(user_context); | 441 PerformPreLoginActions(user_context); |
| 442 PerformLogin(user_context, LoginPerformer::AUTH_MODE_INTERNAL); | 442 PerformLogin(user_context, LoginPerformer::AUTH_MODE_INTERNAL); |
| 443 PerformLoginFinishedActions(false); | |
|
Nikita (slow)
2014/10/28 16:31:19
That's not a correct place for this call since log
afakhry
2014/10/28 17:06:30
As per the comments documentations for ExistingUse
Nikita (slow)
2014/10/28 17:15:22
I'm trying to verify why this call is not unblocki
afakhry
2014/10/28 18:43:22
Because LoginDisplayHostImpl::OnBrowserCreated() c
| |
| 443 } | 444 } |
| 444 | 445 |
| 445 void ExistingUserController::PerformLogin( | 446 void ExistingUserController::PerformLogin( |
| 446 const UserContext& user_context, | 447 const UserContext& user_context, |
| 447 LoginPerformer::AuthorizationMode auth_mode) { | 448 LoginPerformer::AuthorizationMode auth_mode) { |
| 448 // TODO(antrim): remove this output once crash reason is found. | 449 // TODO(antrim): remove this output once crash reason is found. |
| 449 LOG(ERROR) << "Setting flow from PerformLogin"; | 450 LOG(ERROR) << "Setting flow from PerformLogin"; |
| 450 ChromeUserManager::Get() | 451 ChromeUserManager::Get() |
| 451 ->GetUserFlow(user_context.GetUserID()) | 452 ->GetUserFlow(user_context.GetUserID()) |
| 452 ->SetHost(host_); | 453 ->SetHost(host_); |
| (...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1190 is_login_in_progress_ = false; | 1191 is_login_in_progress_ = false; |
| 1191 | 1192 |
| 1192 // Reenable clicking on other windows and status area. | 1193 // Reenable clicking on other windows and status area. |
| 1193 login_display_->SetUIEnabled(true); | 1194 login_display_->SetUIEnabled(true); |
| 1194 | 1195 |
| 1195 if (start_public_session_timer) | 1196 if (start_public_session_timer) |
| 1196 StartPublicSessionAutoLoginTimer(); | 1197 StartPublicSessionAutoLoginTimer(); |
| 1197 } | 1198 } |
| 1198 | 1199 |
| 1199 } // namespace chromeos | 1200 } // namespace chromeos |
| OLD | NEW |