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 675 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
686 offline_failed_ = false; | 686 offline_failed_ = false; |
687 | 687 |
688 if (g_browser_process->platform_part() | 688 if (g_browser_process->platform_part() |
689 ->browser_policy_connector_chromeos() | 689 ->browser_policy_connector_chromeos() |
690 ->IsEnterpriseManaged()) { | 690 ->IsEnterpriseManaged()) { |
691 ShowError(IDS_ENTERPRISE_LOGIN_ERROR_WHITELIST, email); | 691 ShowError(IDS_ENTERPRISE_LOGIN_ERROR_WHITELIST, email); |
692 } else { | 692 } else { |
693 ShowError(IDS_LOGIN_ERROR_WHITELIST, email); | 693 ShowError(IDS_LOGIN_ERROR_WHITELIST, email); |
694 } | 694 } |
695 | 695 |
696 login_display_->ShowSigninUI(email); | 696 if (StartupUtils::IsWebviewSigninEnabled()) |
| 697 login_display_->ShowSigninUI(""); |
| 698 else |
| 699 login_display_->ShowSigninUI(email); |
697 | 700 |
698 if (auth_status_consumer_) { | 701 if (auth_status_consumer_) { |
699 auth_status_consumer_->OnAuthFailure( | 702 auth_status_consumer_->OnAuthFailure( |
700 AuthFailure(AuthFailure::WHITELIST_CHECK_FAILED)); | 703 AuthFailure(AuthFailure::WHITELIST_CHECK_FAILED)); |
701 } | 704 } |
702 | 705 |
703 display_email_.clear(); | 706 display_email_.clear(); |
704 } | 707 } |
705 | 708 |
706 void ExistingUserController::PolicyLoadFailed() { | 709 void ExistingUserController::PolicyLoadFailed() { |
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1191 | 1194 |
1192 // Setting a customized login user flow to perform additional initializations | 1195 // Setting a customized login user flow to perform additional initializations |
1193 // for bootstrap after the user session is started. | 1196 // for bootstrap after the user session is started. |
1194 ChromeUserManager::Get()->SetUserFlow(user_context.GetUserID(), | 1197 ChromeUserManager::Get()->SetUserFlow(user_context.GetUserID(), |
1195 new BootstrapUserFlow(user_context)); | 1198 new BootstrapUserFlow(user_context)); |
1196 | 1199 |
1197 PerformLogin(user_context, LoginPerformer::AUTH_MODE_EXTENSION); | 1200 PerformLogin(user_context, LoginPerformer::AUTH_MODE_EXTENSION); |
1198 } | 1201 } |
1199 | 1202 |
1200 } // namespace chromeos | 1203 } // namespace chromeos |
OLD | NEW |