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

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

Issue 393343002: Rename "managed (mode|user)" to "supervised user" (part 7) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more alphabetize (and rebase again) Created 6 years, 5 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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 10 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
11 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_ actor.h" 11 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_ actor.h"
12 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h" 12 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
13 #include "chrome/browser/chromeos/system/input_device_settings.h" 13 #include "chrome/browser/chromeos/system/input_device_settings.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/ui/webui/about_ui.h" 15 #include "chrome/browser/ui/webui/about_ui.h"
16 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle r.h" 16 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle r.h"
17 #include "chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_ha ndler.h" 17 #include "chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_ha ndler.h"
18 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" 18 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
19 #include "chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handl er.h" 19 #include "chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handl er.h"
20 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h" 20 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h"
21 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h" 21 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
22 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h" 22 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
23 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" 23 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
24 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" 24 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
25 #include "chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.h" 25 #include "chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.h"
26 #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h" 26 #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h"
27 #include "chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler .h" 27 #include "chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler .h"
28 #include "chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h" 28 #include "chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h"
29 #include "chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_s creen_handler.h"
30 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h" 29 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h"
31 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h" 30 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
32 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" 31 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
33 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" 32 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
34 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 33 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
34 #include "chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen _handler.h"
35 #include "chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler .h" 35 #include "chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler .h"
36 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h" 36 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h"
37 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h" 37 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"
38 #include "chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h" 38 #include "chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h"
39 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" 39 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
40 #include "chrome/browser/ui/webui/theme_source.h" 40 #include "chrome/browser/ui/webui/theme_source.h"
41 #include "chrome/common/chrome_constants.h" 41 #include "chrome/common/chrome_constants.h"
42 #include "chrome/common/url_constants.h" 42 #include "chrome/common/url_constants.h"
43 #include "chromeos/chromeos_switches.h" 43 #include "chromeos/chromeos_switches.h"
44 #include "content/public/browser/web_ui.h" 44 #include "content/public/browser/web_ui.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 const char OobeUI::kScreenOobeEnrollment[] = "oauth-enrollment"; 133 const char OobeUI::kScreenOobeEnrollment[] = "oauth-enrollment";
134 const char OobeUI::kScreenOobeReset[] = "reset"; 134 const char OobeUI::kScreenOobeReset[] = "reset";
135 const char OobeUI::kScreenGaiaSignin[] = "gaia-signin"; 135 const char OobeUI::kScreenGaiaSignin[] = "gaia-signin";
136 const char OobeUI::kScreenAccountPicker[] = "account-picker"; 136 const char OobeUI::kScreenAccountPicker[] = "account-picker";
137 const char OobeUI::kScreenKioskAutolaunch[] = "autolaunch"; 137 const char OobeUI::kScreenKioskAutolaunch[] = "autolaunch";
138 const char OobeUI::kScreenKioskEnable[] = "kiosk-enable"; 138 const char OobeUI::kScreenKioskEnable[] = "kiosk-enable";
139 const char OobeUI::kScreenErrorMessage[] = "error-message"; 139 const char OobeUI::kScreenErrorMessage[] = "error-message";
140 const char OobeUI::kScreenUserImagePicker[] = "user-image"; 140 const char OobeUI::kScreenUserImagePicker[] = "user-image";
141 const char OobeUI::kScreenTpmError[] = "tpm-error-message"; 141 const char OobeUI::kScreenTpmError[] = "tpm-error-message";
142 const char OobeUI::kScreenPasswordChanged[] = "password-changed"; 142 const char OobeUI::kScreenPasswordChanged[] = "password-changed";
143 const char OobeUI::kScreenManagedUserCreationFlow[] = "managed-user-creation"; 143 const char OobeUI::kScreenSupervisedUserCreationFlow[] =
144 "managed-user-creation";
144 const char OobeUI::kScreenTermsOfService[] = "terms-of-service"; 145 const char OobeUI::kScreenTermsOfService[] = "terms-of-service";
145 const char OobeUI::kScreenWrongHWID[] = "wrong-hwid"; 146 const char OobeUI::kScreenWrongHWID[] = "wrong-hwid";
146 const char OobeUI::kScreenAutoEnrollmentCheck[] = "auto-enrollment-check"; 147 const char OobeUI::kScreenAutoEnrollmentCheck[] = "auto-enrollment-check";
147 const char OobeUI::kScreenHIDDetection[] = "hid-detection"; 148 const char OobeUI::kScreenHIDDetection[] = "hid-detection";
148 const char OobeUI::kScreenAppLaunchSplash[] = "app-launch-splash"; 149 const char OobeUI::kScreenAppLaunchSplash[] = "app-launch-splash";
149 const char OobeUI::kScreenConfirmPassword[] = "confirm-password"; 150 const char OobeUI::kScreenConfirmPassword[] = "confirm-password";
150 const char OobeUI::kScreenFatalError[] = "fatal-error"; 151 const char OobeUI::kScreenFatalError[] = "fatal-error";
151 const char OobeUI::kScreenControllerPairing[] = "controller-pairing"; 152 const char OobeUI::kScreenControllerPairing[] = "controller-pairing";
152 const char OobeUI::kScreenHostPairing[] = "host-pairing"; 153 const char OobeUI::kScreenHostPairing[] = "host-pairing";
153 154
154 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url) 155 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
155 : WebUIController(web_ui), 156 : WebUIController(web_ui),
156 core_handler_(NULL), 157 core_handler_(NULL),
157 network_dropdown_handler_(NULL), 158 network_dropdown_handler_(NULL),
158 update_screen_handler_(NULL), 159 update_screen_handler_(NULL),
159 network_screen_actor_(NULL), 160 network_screen_actor_(NULL),
160 eula_screen_actor_(NULL), 161 eula_screen_actor_(NULL),
161 hid_detection_screen_actor_(NULL), 162 hid_detection_screen_actor_(NULL),
162 reset_screen_actor_(NULL), 163 reset_screen_actor_(NULL),
163 autolaunch_screen_actor_(NULL), 164 autolaunch_screen_actor_(NULL),
164 kiosk_enable_screen_actor_(NULL), 165 kiosk_enable_screen_actor_(NULL),
165 wrong_hwid_screen_actor_(NULL), 166 wrong_hwid_screen_actor_(NULL),
166 auto_enrollment_check_screen_actor_(NULL), 167 auto_enrollment_check_screen_actor_(NULL),
167 locally_managed_user_creation_screen_actor_(NULL), 168 supervised_user_creation_screen_actor_(NULL),
168 error_screen_handler_(NULL), 169 error_screen_handler_(NULL),
169 signin_screen_handler_(NULL), 170 signin_screen_handler_(NULL),
170 terms_of_service_screen_actor_(NULL), 171 terms_of_service_screen_actor_(NULL),
171 user_image_screen_actor_(NULL), 172 user_image_screen_actor_(NULL),
172 kiosk_app_menu_handler_(NULL), 173 kiosk_app_menu_handler_(NULL),
173 current_screen_(SCREEN_UNKNOWN), 174 current_screen_(SCREEN_UNKNOWN),
174 previous_screen_(SCREEN_UNKNOWN), 175 previous_screen_(SCREEN_UNKNOWN),
175 ready_(false) { 176 ready_(false) {
176 display_type_ = GetDisplayType(url); 177 display_type_ = GetDisplayType(url);
177 InitializeScreenMaps(); 178 InitializeScreenMaps();
(...skipping 30 matching lines...) Expand all
208 KioskAutolaunchScreenHandler* autolaunch_screen_handler = 209 KioskAutolaunchScreenHandler* autolaunch_screen_handler =
209 new KioskAutolaunchScreenHandler(); 210 new KioskAutolaunchScreenHandler();
210 autolaunch_screen_actor_ = autolaunch_screen_handler; 211 autolaunch_screen_actor_ = autolaunch_screen_handler;
211 AddScreenHandler(autolaunch_screen_handler); 212 AddScreenHandler(autolaunch_screen_handler);
212 213
213 KioskEnableScreenHandler* kiosk_enable_screen_handler = 214 KioskEnableScreenHandler* kiosk_enable_screen_handler =
214 new KioskEnableScreenHandler(); 215 new KioskEnableScreenHandler();
215 kiosk_enable_screen_actor_ = kiosk_enable_screen_handler; 216 kiosk_enable_screen_actor_ = kiosk_enable_screen_handler;
216 AddScreenHandler(kiosk_enable_screen_handler); 217 AddScreenHandler(kiosk_enable_screen_handler);
217 218
218 LocallyManagedUserCreationScreenHandler* 219 SupervisedUserCreationScreenHandler* supervised_user_creation_screen_handler =
219 locally_managed_user_creation_screen_handler = 220 new SupervisedUserCreationScreenHandler();
220 new LocallyManagedUserCreationScreenHandler(); 221 supervised_user_creation_screen_actor_ =
221 locally_managed_user_creation_screen_actor_ = 222 supervised_user_creation_screen_handler;
222 locally_managed_user_creation_screen_handler; 223 AddScreenHandler(supervised_user_creation_screen_handler);
223 AddScreenHandler(locally_managed_user_creation_screen_handler);
224 224
225 WrongHWIDScreenHandler* wrong_hwid_screen_handler = 225 WrongHWIDScreenHandler* wrong_hwid_screen_handler =
226 new WrongHWIDScreenHandler(); 226 new WrongHWIDScreenHandler();
227 wrong_hwid_screen_actor_ = wrong_hwid_screen_handler; 227 wrong_hwid_screen_actor_ = wrong_hwid_screen_handler;
228 AddScreenHandler(wrong_hwid_screen_handler); 228 AddScreenHandler(wrong_hwid_screen_handler);
229 229
230 AutoEnrollmentCheckScreenHandler* auto_enrollment_check_screen_handler = 230 AutoEnrollmentCheckScreenHandler* auto_enrollment_check_screen_handler =
231 new AutoEnrollmentCheckScreenHandler(); 231 new AutoEnrollmentCheckScreenHandler();
232 auto_enrollment_check_screen_actor_ = auto_enrollment_check_screen_handler; 232 auto_enrollment_check_screen_actor_ = auto_enrollment_check_screen_handler;
233 AddScreenHandler(auto_enrollment_check_screen_handler); 233 AddScreenHandler(auto_enrollment_check_screen_handler);
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 } 374 }
375 375
376 UserImageScreenActor* OobeUI::GetUserImageScreenActor() { 376 UserImageScreenActor* OobeUI::GetUserImageScreenActor() {
377 return user_image_screen_actor_; 377 return user_image_screen_actor_;
378 } 378 }
379 379
380 ErrorScreenActor* OobeUI::GetErrorScreenActor() { 380 ErrorScreenActor* OobeUI::GetErrorScreenActor() {
381 return error_screen_handler_; 381 return error_screen_handler_;
382 } 382 }
383 383
384 LocallyManagedUserCreationScreenHandler* 384 SupervisedUserCreationScreenHandler*
385 OobeUI::GetLocallyManagedUserCreationScreenActor() { 385 OobeUI::GetSupervisedUserCreationScreenActor() {
386 return locally_managed_user_creation_screen_actor_; 386 return supervised_user_creation_screen_actor_;
387 } 387 }
388 388
389 AppLaunchSplashScreenActor* 389 AppLaunchSplashScreenActor*
390 OobeUI::GetAppLaunchSplashScreenActor() { 390 OobeUI::GetAppLaunchSplashScreenActor() {
391 return app_launch_splash_screen_actor_; 391 return app_launch_splash_screen_actor_;
392 } 392 }
393 393
394 void OobeUI::GetLocalizedStrings(base::DictionaryValue* localized_strings) { 394 void OobeUI::GetLocalizedStrings(base::DictionaryValue* localized_strings) {
395 // Note, handlers_[0] is a GenericHandler used by the WebUI. 395 // Note, handlers_[0] is a GenericHandler used by the WebUI.
396 for (size_t i = 0; i < handlers_.size(); ++i) 396 for (size_t i = 0; i < handlers_.size(); ++i)
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 screen_names_[SCREEN_OOBE_ENROLLMENT] = kScreenOobeEnrollment; 431 screen_names_[SCREEN_OOBE_ENROLLMENT] = kScreenOobeEnrollment;
432 screen_names_[SCREEN_OOBE_RESET] = kScreenOobeReset; 432 screen_names_[SCREEN_OOBE_RESET] = kScreenOobeReset;
433 screen_names_[SCREEN_GAIA_SIGNIN] = kScreenGaiaSignin; 433 screen_names_[SCREEN_GAIA_SIGNIN] = kScreenGaiaSignin;
434 screen_names_[SCREEN_ACCOUNT_PICKER] = kScreenAccountPicker; 434 screen_names_[SCREEN_ACCOUNT_PICKER] = kScreenAccountPicker;
435 screen_names_[SCREEN_KIOSK_AUTOLAUNCH] = kScreenKioskAutolaunch; 435 screen_names_[SCREEN_KIOSK_AUTOLAUNCH] = kScreenKioskAutolaunch;
436 screen_names_[SCREEN_KIOSK_ENABLE] = kScreenKioskEnable; 436 screen_names_[SCREEN_KIOSK_ENABLE] = kScreenKioskEnable;
437 screen_names_[SCREEN_ERROR_MESSAGE] = kScreenErrorMessage; 437 screen_names_[SCREEN_ERROR_MESSAGE] = kScreenErrorMessage;
438 screen_names_[SCREEN_USER_IMAGE_PICKER] = kScreenUserImagePicker; 438 screen_names_[SCREEN_USER_IMAGE_PICKER] = kScreenUserImagePicker;
439 screen_names_[SCREEN_TPM_ERROR] = kScreenTpmError; 439 screen_names_[SCREEN_TPM_ERROR] = kScreenTpmError;
440 screen_names_[SCREEN_PASSWORD_CHANGED] = kScreenPasswordChanged; 440 screen_names_[SCREEN_PASSWORD_CHANGED] = kScreenPasswordChanged;
441 screen_names_[SCREEN_CREATE_MANAGED_USER_FLOW] = 441 screen_names_[SCREEN_CREATE_SUPERVISED_USER_FLOW] =
442 kScreenManagedUserCreationFlow; 442 kScreenSupervisedUserCreationFlow;
443 screen_names_[SCREEN_TERMS_OF_SERVICE] = kScreenTermsOfService; 443 screen_names_[SCREEN_TERMS_OF_SERVICE] = kScreenTermsOfService;
444 screen_names_[SCREEN_WRONG_HWID] = kScreenWrongHWID; 444 screen_names_[SCREEN_WRONG_HWID] = kScreenWrongHWID;
445 screen_names_[SCREEN_AUTO_ENROLLMENT_CHECK] = kScreenAutoEnrollmentCheck; 445 screen_names_[SCREEN_AUTO_ENROLLMENT_CHECK] = kScreenAutoEnrollmentCheck;
446 screen_names_[SCREEN_APP_LAUNCH_SPLASH] = kScreenAppLaunchSplash; 446 screen_names_[SCREEN_APP_LAUNCH_SPLASH] = kScreenAppLaunchSplash;
447 screen_names_[SCREEN_CONFIRM_PASSWORD] = kScreenConfirmPassword; 447 screen_names_[SCREEN_CONFIRM_PASSWORD] = kScreenConfirmPassword;
448 screen_names_[SCREEN_FATAL_ERROR] = kScreenFatalError; 448 screen_names_[SCREEN_FATAL_ERROR] = kScreenFatalError;
449 screen_names_[SCREEN_OOBE_CONTROLLER_PAIRING] = kScreenControllerPairing; 449 screen_names_[SCREEN_OOBE_CONTROLLER_PAIRING] = kScreenControllerPairing;
450 screen_names_[SCREEN_OOBE_HOST_PAIRING] = kScreenHostPairing; 450 screen_names_[SCREEN_OOBE_HOST_PAIRING] = kScreenHostPairing;
451 451
452 screen_ids_.clear(); 452 screen_ids_.clear();
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 DCHECK(screen_ids_.count(screen)) 530 DCHECK(screen_ids_.count(screen))
531 << "Screen should be registered in InitializeScreenMaps()"; 531 << "Screen should be registered in InitializeScreenMaps()";
532 Screen new_screen = screen_ids_[screen]; 532 Screen new_screen = screen_ids_[screen];
533 FOR_EACH_OBSERVER(Observer, 533 FOR_EACH_OBSERVER(Observer,
534 observer_list_, 534 observer_list_,
535 OnCurrentScreenChanged(current_screen_, new_screen)); 535 OnCurrentScreenChanged(current_screen_, new_screen));
536 current_screen_ = new_screen; 536 current_screen_ = new_screen;
537 } 537 }
538 538
539 } // namespace chromeos 539 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.h ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698