| Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| index d7b9de448a71ce908d6741b33881b3759e29b978..c4fa3aa77785760a9ab823f7bd1c9a1a6f843bdb 100644
|
| --- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| +++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| @@ -38,7 +38,6 @@
|
| #include "chrome/browser/chromeos/language_preferences.h"
|
| #include "chrome/browser/chromeos/login/arc_kiosk_controller.h"
|
| #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
|
| -#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h"
|
| #include "chrome/browser/chromeos/login/existing_user_controller.h"
|
| #include "chrome/browser/chromeos/login/helper.h"
|
| #include "chrome/browser/chromeos/login/login_wizard.h"
|
| @@ -573,11 +572,6 @@ void LoginDisplayHostImpl::Finalize() {
|
| }
|
| }
|
|
|
| -void LoginDisplayHostImpl::OnCompleteLogin() {
|
| - if (auto_enrollment_controller_)
|
| - auto_enrollment_controller_->Cancel();
|
| -}
|
| -
|
| void LoginDisplayHostImpl::OpenProxySettings() {
|
| if (login_view_)
|
| login_view_->OpenProxySettings();
|
| @@ -590,12 +584,6 @@ void LoginDisplayHostImpl::SetStatusAreaVisible(bool visible) {
|
| login_view_->SetStatusAreaVisible(visible);
|
| }
|
|
|
| -AutoEnrollmentController* LoginDisplayHostImpl::GetAutoEnrollmentController() {
|
| - if (!auto_enrollment_controller_)
|
| - auto_enrollment_controller_.reset(new AutoEnrollmentController());
|
| - return auto_enrollment_controller_.get();
|
| -}
|
| -
|
| void LoginDisplayHostImpl::StartWizard(OobeScreen first_screen) {
|
| DisableKeyboardOverscroll();
|
|
|
| @@ -755,11 +743,6 @@ void LoginDisplayHostImpl::StartSignInScreen(
|
| SetStatusAreaVisible(true);
|
| existing_user_controller_->Init(users);
|
|
|
| - // We might be here after a reboot that was triggered after OOBE was complete,
|
| - // so check for auto-enrollment again. This might catch a cached decision from
|
| - // a previous oobe flow, or might start a new check with the server.
|
| - GetAutoEnrollmentController()->Start();
|
| -
|
| // Initiate mobile config load.
|
| MobileConfig::GetInstance();
|
|
|
|
|