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

Side by Side Diff: chrome/browser/resources/chromeos/login/login_common.js

Issue 403343002: Rename "managed (mode|user)" to "supervised user" (part 8) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix2 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 /** 5 /**
6 * @fileoverview Common OOBE controller methods. 6 * @fileoverview Common OOBE controller methods.
7 */ 7 */
8 8
9 <include src="../../login/screen.js"></include> 9 <include src="../../login/screen.js"></include>
10 <include src="screen_context.js"></include> 10 <include src="screen_context.js"></include>
11 <include src="../user_images_grid.js"></include> 11 <include src="../user_images_grid.js"></include>
12 <include src="apps_menu.js"></include> 12 <include src="apps_menu.js"></include>
13 <include src="../../login/bubble.js"></include> 13 <include src="../../login/bubble.js"></include>
14 <include src="../../login/display_manager.js"></include> 14 <include src="../../login/display_manager.js"></include>
15 <include src="header_bar.js"></include> 15 <include src="header_bar.js"></include>
16 <include src="network_dropdown.js"></include> 16 <include src="network_dropdown.js"></include>
17 <include src="oobe_screen_reset.js"></include> 17 <include src="oobe_screen_reset.js"></include>
18 <include src="oobe_screen_autolaunch.js"></include> 18 <include src="oobe_screen_autolaunch.js"></include>
19 <include src="oobe_screen_enable_kiosk.js"></include> 19 <include src="oobe_screen_enable_kiosk.js"></include>
20 <include src="oobe_screen_terms_of_service.js"></include> 20 <include src="oobe_screen_terms_of_service.js"></include>
21 <include src="oobe_screen_user_image.js"></include> 21 <include src="oobe_screen_user_image.js"></include>
22 <include src="../../login/screen_account_picker.js"></include> 22 <include src="../../login/screen_account_picker.js"></include>
23 <include src="screen_app_launch_splash.js"></include> 23 <include src="screen_app_launch_splash.js"></include>
24 <include src="screen_error_message.js"></include> 24 <include src="screen_error_message.js"></include>
25 <include src="screen_gaia_signin.js"></include> 25 <include src="screen_gaia_signin.js"></include>
26 <include src="screen_locally_managed_user_creation.js"></include> 26 <include src="screen_supervised_user_creation.js"></include>
27 <include src="screen_password_changed.js"></include> 27 <include src="screen_password_changed.js"></include>
28 <include src="screen_tpm_error.js"></include> 28 <include src="screen_tpm_error.js"></include>
29 <include src="screen_wrong_hwid.js"></include> 29 <include src="screen_wrong_hwid.js"></include>
30 <include src="screen_confirm_password.js"></include> 30 <include src="screen_confirm_password.js"></include>
31 <include src="screen_fatal_error.js"></include> 31 <include src="screen_fatal_error.js"></include>
32 <include src="../../login/user_pod_row.js"></include> 32 <include src="../../login/user_pod_row.js"></include>
33 <include src="../../login/resource_loader.js"></include> 33 <include src="../../login/resource_loader.js"></include>
34 34
35 cr.define('cr.ui', function() { 35 cr.define('cr.ui', function() {
36 var DisplayManager = cr.ui.login.DisplayManager; 36 var DisplayManager = cr.ui.login.DisplayManager;
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 150
151 /** 151 /**
152 * Shows password changed screen that offers migration. 152 * Shows password changed screen that offers migration.
153 * @param {boolean} showError Whether to show the incorrect password error. 153 * @param {boolean} showError Whether to show the incorrect password error.
154 */ 154 */
155 Oobe.showPasswordChangedScreen = function(showError) { 155 Oobe.showPasswordChangedScreen = function(showError) {
156 DisplayManager.showPasswordChangedScreen(showError); 156 DisplayManager.showPasswordChangedScreen(showError);
157 }; 157 };
158 158
159 /** 159 /**
160 * Shows dialog to create managed user. 160 * Shows dialog to create a supervised user.
Pam (message me for reviews) 2014/07/23 21:13:39 I can't find where this method is used, to make ce
Denis Kuznetsov (DE-MUC) 2014/07/24 11:37:22 Yes.
161 */ 161 */
162 Oobe.showManagedUserCreationScreen = function() { 162 Oobe.showSupervisedUserCreationScreen = function() {
163 DisplayManager.showManagedUserCreationScreen(); 163 DisplayManager.showSupervisedUserCreationScreen();
164 }; 164 };
165 165
166 /** 166 /**
167 * Shows TPM error screen. 167 * Shows TPM error screen.
168 */ 168 */
169 Oobe.showTpmError = function() { 169 Oobe.showTpmError = function() {
170 DisplayManager.showTpmError(); 170 DisplayManager.showTpmError();
171 }; 171 };
172 172
173 /** 173 /**
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 cr.ui.login.ResourceLoader.loadAssets(SCREEN_OOBE_ENROLLMENT, function() { 361 cr.ui.login.ResourceLoader.loadAssets(SCREEN_OOBE_ENROLLMENT, function() {
362 // This screen is async-loaded so we manually trigger i18n processing. 362 // This screen is async-loaded so we manually trigger i18n processing.
363 i18nTemplate.process($('oauth-enrollment'), loadTimeData); 363 i18nTemplate.process($('oauth-enrollment'), loadTimeData);
364 // Delayed binding since this isn't defined yet. 364 // Delayed binding since this isn't defined yet.
365 login.OAuthEnrollmentScreen.register(); 365 login.OAuthEnrollmentScreen.register();
366 }); 366 });
367 367
368 // Delayed binding since this isn't defined yet. 368 // Delayed binding since this isn't defined yet.
369 cr.ui.Oobe.initialize(); 369 cr.ui.Oobe.initialize();
370 }); 370 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698