Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(874)

Unified Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.cc

Issue 2771803003: Don't start FRE from the login screen (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 5230a0da4eb1619e3831faef42c9c9cf4590b814..b2535cc673274487cb8bdbb3f1120115806bed19 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"
@@ -592,11 +591,6 @@ void LoginDisplayHostImpl::Finalize() {
}
}
-void LoginDisplayHostImpl::OnCompleteLogin() {
- if (auto_enrollment_controller_)
- auto_enrollment_controller_->Cancel();
-}
-
void LoginDisplayHostImpl::OpenProxySettings() {
if (login_view_)
login_view_->OpenProxySettings();
@@ -609,12 +603,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();
@@ -774,11 +762,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();

Powered by Google App Engine
This is Rietveld 408576698