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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

Issue 289133002: Add a enterprise enrollment check screen to OOBE in ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments. Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/ui/webui/chromeos/login/oobe_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/ref_counted_memory.h" 10 #include "base/memory/ref_counted_memory.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/browser_about_handler.h" 12 #include "chrome/browser/browser_about_handler.h"
13 #include "chrome/browser/chrome_notification_types.h" 13 #include "chrome/browser/chrome_notification_types.h"
14 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 14 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
15 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_ actor.h"
15 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h" 16 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
16 #include "chrome/browser/chromeos/login/lock/screen_locker.h" 17 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
17 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 18 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
18 #include "chrome/browser/chromeos/login/users/user_manager.h" 19 #include "chrome/browser/chromeos/login/users/user_manager.h"
19 #include "chrome/browser/chromeos/login/wizard_controller.h" 20 #include "chrome/browser/chromeos/login/wizard_controller.h"
20 #include "chrome/browser/chromeos/system/input_device_settings.h" 21 #include "chrome/browser/chromeos/system/input_device_settings.h"
21 #include "chrome/browser/profiles/profile.h" 22 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/ui/webui/about_ui.h" 23 #include "chrome/browser/ui/webui/about_ui.h"
23 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle r.h" 24 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle r.h"
25 #include "chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_ha ndler.h"
24 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" 26 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
25 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h" 27 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h"
26 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h" 28 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
27 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h" 29 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
28 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" 30 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
29 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" 31 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
30 #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h" 32 #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h"
31 #include "chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler .h" 33 #include "chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler .h"
32 #include "chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h" 34 #include "chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h"
33 #include "chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_s creen_handler.h" 35 #include "chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_s creen_handler.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 const char OobeUI::kScreenKioskAutolaunch[] = "autolaunch"; 145 const char OobeUI::kScreenKioskAutolaunch[] = "autolaunch";
144 const char OobeUI::kScreenKioskEnable[] = "kiosk-enable"; 146 const char OobeUI::kScreenKioskEnable[] = "kiosk-enable";
145 const char OobeUI::kScreenErrorMessage[] = "error-message"; 147 const char OobeUI::kScreenErrorMessage[] = "error-message";
146 const char OobeUI::kScreenUserImagePicker[] = "user-image"; 148 const char OobeUI::kScreenUserImagePicker[] = "user-image";
147 const char OobeUI::kScreenTpmError[] = "tpm-error-message"; 149 const char OobeUI::kScreenTpmError[] = "tpm-error-message";
148 const char OobeUI::kScreenPasswordChanged[] = "password-changed"; 150 const char OobeUI::kScreenPasswordChanged[] = "password-changed";
149 const char OobeUI::kScreenManagedUserCreationFlow[] 151 const char OobeUI::kScreenManagedUserCreationFlow[]
150 = "managed-user-creation"; 152 = "managed-user-creation";
151 const char OobeUI::kScreenTermsOfService[] = "terms-of-service"; 153 const char OobeUI::kScreenTermsOfService[] = "terms-of-service";
152 const char OobeUI::kScreenWrongHWID[] = "wrong-hwid"; 154 const char OobeUI::kScreenWrongHWID[] = "wrong-hwid";
155 const char OobeUI::kScreenAutoEnrollmentCheck[]
156 = "auto-enrollment-check";
153 const char OobeUI::kScreenHIDDetection[] = "hid-detection"; 157 const char OobeUI::kScreenHIDDetection[] = "hid-detection";
154 const char OobeUI::kScreenAppLaunchSplash[] = "app-launch-splash"; 158 const char OobeUI::kScreenAppLaunchSplash[] = "app-launch-splash";
155 const char OobeUI::kScreenConfirmPassword[] = "confirm-password"; 159 const char OobeUI::kScreenConfirmPassword[] = "confirm-password";
156 const char OobeUI::kScreenFatalError[] = "fatal-error"; 160 const char OobeUI::kScreenFatalError[] = "fatal-error";
157 161
158 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url) 162 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
159 : WebUIController(web_ui), 163 : WebUIController(web_ui),
160 core_handler_(NULL), 164 core_handler_(NULL),
161 network_dropdown_handler_(NULL), 165 network_dropdown_handler_(NULL),
162 update_screen_handler_(NULL), 166 update_screen_handler_(NULL),
163 network_screen_actor_(NULL), 167 network_screen_actor_(NULL),
164 eula_screen_actor_(NULL), 168 eula_screen_actor_(NULL),
165 hid_detection_screen_actor_(NULL), 169 hid_detection_screen_actor_(NULL),
166 reset_screen_actor_(NULL), 170 reset_screen_actor_(NULL),
167 autolaunch_screen_actor_(NULL), 171 autolaunch_screen_actor_(NULL),
168 kiosk_enable_screen_actor_(NULL), 172 kiosk_enable_screen_actor_(NULL),
169 wrong_hwid_screen_actor_(NULL), 173 wrong_hwid_screen_actor_(NULL),
174 auto_enrollment_check_screen_actor_(NULL),
170 locally_managed_user_creation_screen_actor_(NULL), 175 locally_managed_user_creation_screen_actor_(NULL),
171 error_screen_handler_(NULL), 176 error_screen_handler_(NULL),
172 signin_screen_handler_(NULL), 177 signin_screen_handler_(NULL),
173 terms_of_service_screen_actor_(NULL), 178 terms_of_service_screen_actor_(NULL),
174 user_image_screen_actor_(NULL), 179 user_image_screen_actor_(NULL),
175 kiosk_app_menu_handler_(NULL), 180 kiosk_app_menu_handler_(NULL),
176 current_screen_(SCREEN_UNKNOWN), 181 current_screen_(SCREEN_UNKNOWN),
177 previous_screen_(SCREEN_UNKNOWN), 182 previous_screen_(SCREEN_UNKNOWN),
178 ready_(false) { 183 ready_(false) {
179 display_type_ = GetDisplayType(url); 184 display_type_ = GetDisplayType(url);
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 new LocallyManagedUserCreationScreenHandler(); 228 new LocallyManagedUserCreationScreenHandler();
224 locally_managed_user_creation_screen_actor_ = 229 locally_managed_user_creation_screen_actor_ =
225 locally_managed_user_creation_screen_handler; 230 locally_managed_user_creation_screen_handler;
226 AddScreenHandler(locally_managed_user_creation_screen_handler); 231 AddScreenHandler(locally_managed_user_creation_screen_handler);
227 232
228 WrongHWIDScreenHandler* wrong_hwid_screen_handler = 233 WrongHWIDScreenHandler* wrong_hwid_screen_handler =
229 new WrongHWIDScreenHandler(); 234 new WrongHWIDScreenHandler();
230 wrong_hwid_screen_actor_ = wrong_hwid_screen_handler; 235 wrong_hwid_screen_actor_ = wrong_hwid_screen_handler;
231 AddScreenHandler(wrong_hwid_screen_handler); 236 AddScreenHandler(wrong_hwid_screen_handler);
232 237
238 AutoEnrollmentCheckScreenHandler* auto_enrollment_check_screen_handler =
239 new AutoEnrollmentCheckScreenHandler();
240 auto_enrollment_check_screen_actor_ = auto_enrollment_check_screen_handler;
241 AddScreenHandler(auto_enrollment_check_screen_handler);
242
233 HIDDetectionScreenHandler* hid_detection_screen_handler = 243 HIDDetectionScreenHandler* hid_detection_screen_handler =
234 new HIDDetectionScreenHandler(); 244 new HIDDetectionScreenHandler();
235 hid_detection_screen_actor_ = hid_detection_screen_handler; 245 hid_detection_screen_actor_ = hid_detection_screen_handler;
236 AddScreenHandler(hid_detection_screen_handler); 246 AddScreenHandler(hid_detection_screen_handler);
237 247
238 EnrollmentScreenHandler* enrollment_screen_handler = 248 EnrollmentScreenHandler* enrollment_screen_handler =
239 new EnrollmentScreenHandler(); 249 new EnrollmentScreenHandler();
240 enrollment_screen_actor_ = enrollment_screen_handler; 250 enrollment_screen_actor_ = enrollment_screen_handler;
241 AddScreenHandler(enrollment_screen_handler); 251 AddScreenHandler(enrollment_screen_handler);
242 252
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 } 348 }
339 349
340 TermsOfServiceScreenActor* OobeUI::GetTermsOfServiceScreenActor() { 350 TermsOfServiceScreenActor* OobeUI::GetTermsOfServiceScreenActor() {
341 return terms_of_service_screen_actor_; 351 return terms_of_service_screen_actor_;
342 } 352 }
343 353
344 WrongHWIDScreenActor* OobeUI::GetWrongHWIDScreenActor() { 354 WrongHWIDScreenActor* OobeUI::GetWrongHWIDScreenActor() {
345 return wrong_hwid_screen_actor_; 355 return wrong_hwid_screen_actor_;
346 } 356 }
347 357
358 AutoEnrollmentCheckScreenActor* OobeUI::GetAutoEnrollmentCheckScreenActor() {
359 return auto_enrollment_check_screen_actor_;
360 }
361
348 HIDDetectionScreenActor* OobeUI::GetHIDDetectionScreenActor() { 362 HIDDetectionScreenActor* OobeUI::GetHIDDetectionScreenActor() {
349 return hid_detection_screen_actor_; 363 return hid_detection_screen_actor_;
350 } 364 }
351 365
352 UserImageScreenActor* OobeUI::GetUserImageScreenActor() { 366 UserImageScreenActor* OobeUI::GetUserImageScreenActor() {
353 return user_image_screen_actor_; 367 return user_image_screen_actor_;
354 } 368 }
355 369
356 ErrorScreenActor* OobeUI::GetErrorScreenActor() { 370 ErrorScreenActor* OobeUI::GetErrorScreenActor() {
357 return error_screen_handler_; 371 return error_screen_handler_;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 screen_names_[SCREEN_KIOSK_AUTOLAUNCH] = kScreenKioskAutolaunch; 425 screen_names_[SCREEN_KIOSK_AUTOLAUNCH] = kScreenKioskAutolaunch;
412 screen_names_[SCREEN_KIOSK_ENABLE] = kScreenKioskEnable; 426 screen_names_[SCREEN_KIOSK_ENABLE] = kScreenKioskEnable;
413 screen_names_[SCREEN_ERROR_MESSAGE] = kScreenErrorMessage; 427 screen_names_[SCREEN_ERROR_MESSAGE] = kScreenErrorMessage;
414 screen_names_[SCREEN_USER_IMAGE_PICKER] = kScreenUserImagePicker; 428 screen_names_[SCREEN_USER_IMAGE_PICKER] = kScreenUserImagePicker;
415 screen_names_[SCREEN_TPM_ERROR] = kScreenTpmError; 429 screen_names_[SCREEN_TPM_ERROR] = kScreenTpmError;
416 screen_names_[SCREEN_PASSWORD_CHANGED] = kScreenPasswordChanged; 430 screen_names_[SCREEN_PASSWORD_CHANGED] = kScreenPasswordChanged;
417 screen_names_[SCREEN_CREATE_MANAGED_USER_FLOW] = 431 screen_names_[SCREEN_CREATE_MANAGED_USER_FLOW] =
418 kScreenManagedUserCreationFlow; 432 kScreenManagedUserCreationFlow;
419 screen_names_[SCREEN_TERMS_OF_SERVICE] = kScreenTermsOfService; 433 screen_names_[SCREEN_TERMS_OF_SERVICE] = kScreenTermsOfService;
420 screen_names_[SCREEN_WRONG_HWID] = kScreenWrongHWID; 434 screen_names_[SCREEN_WRONG_HWID] = kScreenWrongHWID;
435 screen_names_[SCREEN_AUTO_ENROLLMENT_CHECK] = kScreenAutoEnrollmentCheck;
421 screen_names_[SCREEN_APP_LAUNCH_SPLASH] = kScreenAppLaunchSplash; 436 screen_names_[SCREEN_APP_LAUNCH_SPLASH] = kScreenAppLaunchSplash;
422 screen_names_[SCREEN_CONFIRM_PASSWORD] = kScreenConfirmPassword; 437 screen_names_[SCREEN_CONFIRM_PASSWORD] = kScreenConfirmPassword;
423 screen_names_[SCREEN_FATAL_ERROR] = kScreenFatalError; 438 screen_names_[SCREEN_FATAL_ERROR] = kScreenFatalError;
424 439
425 screen_ids_.clear(); 440 screen_ids_.clear();
426 for (size_t i = 0; i < screen_names_.size(); ++i) 441 for (size_t i = 0; i < screen_names_.size(); ++i)
427 screen_ids_[screen_names_[i]] = static_cast<Screen>(i); 442 screen_ids_[screen_names_[i]] = static_cast<Screen>(i);
428 } 443 }
429 444
430 void OobeUI::AddScreenHandler(BaseScreenHandler* handler) { 445 void OobeUI::AddScreenHandler(BaseScreenHandler* handler) {
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 observer_list_, 521 observer_list_,
507 OnCurrentScreenChanged(current_screen_, new_screen)); 522 OnCurrentScreenChanged(current_screen_, new_screen));
508 current_screen_ = new_screen; 523 current_screen_ = new_screen;
509 } else { 524 } else {
510 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()"; 525 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()";
511 current_screen_ = SCREEN_UNKNOWN; 526 current_screen_ = SCREEN_UNKNOWN;
512 } 527 }
513 } 528 }
514 529
515 } // namespace chromeos 530 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698