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

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

Issue 83293004: kiosk: Show enrollment screen first if needed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, fix LOG(INFO) Created 7 years 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/login_ui_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/login_display_host_impl.cc
diff --git a/chrome/browser/chromeos/login/login_display_host_impl.cc b/chrome/browser/chromeos/login/login_display_host_impl.cc
index cc4355ccab6e2de001ea765d5888b42060b9567c..8b24997b548401f5c47ad5a67340a1d567297cb4 100644
--- a/chrome/browser/chromeos/login/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/login_display_host_impl.cc
@@ -1122,7 +1122,6 @@ void ShowLoginWizard(const std::string& first_screen_name) {
bool show_app_launch_splash_screen = (first_screen_name ==
chromeos::WizardController::kAppLaunchSplashScreenName);
-
if (show_app_launch_splash_screen) {
const std::string& auto_launch_app_id =
chromeos::KioskAppManager::Get()->GetAutoLaunchApp();
@@ -1130,6 +1129,16 @@ void ShowLoginWizard(const std::string& first_screen_name) {
return;
}
+ bool should_show_enrollment_screen =
+ first_screen_name.empty() && oobe_complete &&
+ chromeos::WizardController::ShouldAutoStartEnrollment() &&
+ !g_browser_process->browser_policy_connector()->IsEnterpriseManaged();
+ if (should_show_enrollment_screen) {
+ display_host->StartWizard(chromeos::WizardController::kEnrollmentScreenName,
+ scoped_ptr<DictionaryValue>());
+ return;
+ }
+
bool show_login_screen =
(first_screen_name.empty() && oobe_complete) ||
first_screen_name == chromeos::WizardController::kLoginScreenName;
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/login_ui_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698