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

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

Issue 426153003: Consumer management enrollment signin screen change: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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
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 /** 5 /**
6 * @fileoverview Login UI header bar implementation. 6 * @fileoverview Login UI header bar implementation.
7 */ 7 */
8 8
9 cr.define('login', function() { 9 cr.define('login', function() {
10 /** 10 /**
(...skipping 27 matching lines...) Expand all
38 $('cancel-add-user-button').addEventListener('click', 38 $('cancel-add-user-button').addEventListener('click',
39 this.handleCancelAddUserClick_); 39 this.handleCancelAddUserClick_);
40 $('guest-user-header-bar-item').addEventListener('click', 40 $('guest-user-header-bar-item').addEventListener('click',
41 this.handleGuestClick_); 41 this.handleGuestClick_);
42 $('guest-user-button').addEventListener('click', 42 $('guest-user-button').addEventListener('click',
43 this.handleGuestClick_); 43 this.handleGuestClick_);
44 $('sign-out-user-button').addEventListener('click', 44 $('sign-out-user-button').addEventListener('click',
45 this.handleSignoutClick_); 45 this.handleSignoutClick_);
46 $('cancel-multiple-sign-in-button').addEventListener('click', 46 $('cancel-multiple-sign-in-button').addEventListener('click',
47 this.handleCancelMultipleSignInClick_); 47 this.handleCancelMultipleSignInClick_);
48 $('cancel-consumer-management-enrollment-button')
49 .addEventListener('click',
50 this.handleCancelConsumerManagementEnrollmentClick_);
48 if (Oobe.getInstance().displayType == DISPLAY_TYPE.LOGIN || 51 if (Oobe.getInstance().displayType == DISPLAY_TYPE.LOGIN ||
49 Oobe.getInstance().displayType == DISPLAY_TYPE.OOBE) { 52 Oobe.getInstance().displayType == DISPLAY_TYPE.OOBE) {
50 if (Oobe.getInstance().newKioskUI) 53 if (Oobe.getInstance().newKioskUI)
51 chrome.send('initializeKioskApps'); 54 chrome.send('initializeKioskApps');
52 else 55 else
53 login.AppsMenuButton.decorate($('show-apps-button')); 56 login.AppsMenuButton.decorate($('show-apps-button'));
54 } 57 }
55 this.updateUI_(); 58 this.updateUI_();
56 }, 59 },
57 60
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 * Cancel user adding button handler. 150 * Cancel user adding button handler.
148 * 151 *
149 * @private 152 * @private
150 */ 153 */
151 handleCancelMultipleSignInClick_: function(e) { 154 handleCancelMultipleSignInClick_: function(e) {
152 chrome.send('cancelUserAdding'); 155 chrome.send('cancelUserAdding');
153 e.stopPropagation(); 156 e.stopPropagation();
154 }, 157 },
155 158
156 /** 159 /**
160 * Cancel consumer management enrollment button handler.
161 *
162 * @private
163 */
164 handleCancelConsumerManagementEnrollmentClick_: function(e) {
165 chrome.send('cancelConsumerManagementEnrollment');
166 e.stopPropagation();
167 },
168
169 /**
157 * If true then "Browse as Guest" button is shown. 170 * If true then "Browse as Guest" button is shown.
158 * 171 *
159 * @type {boolean} 172 * @type {boolean}
160 */ 173 */
161 set showGuestButton(value) { 174 set showGuestButton(value) {
162 this.showGuest_ = value; 175 this.showGuest_ = value;
163 this.updateUI_(); 176 this.updateUI_();
164 }, 177 },
165 178
166 /** 179 /**
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 updateUI_: function() { 218 updateUI_: function() {
206 var gaiaIsActive = (this.signinUIState_ == SIGNIN_UI_STATE.GAIA_SIGNIN); 219 var gaiaIsActive = (this.signinUIState_ == SIGNIN_UI_STATE.GAIA_SIGNIN);
207 var accountPickerIsActive = 220 var accountPickerIsActive =
208 (this.signinUIState_ == SIGNIN_UI_STATE.ACCOUNT_PICKER); 221 (this.signinUIState_ == SIGNIN_UI_STATE.ACCOUNT_PICKER);
209 var managedUserCreationDialogIsActive = 222 var managedUserCreationDialogIsActive =
210 (this.signinUIState_ == SIGNIN_UI_STATE.MANAGED_USER_CREATION_FLOW); 223 (this.signinUIState_ == SIGNIN_UI_STATE.MANAGED_USER_CREATION_FLOW);
211 var wrongHWIDWarningIsActive = 224 var wrongHWIDWarningIsActive =
212 (this.signinUIState_ == SIGNIN_UI_STATE.WRONG_HWID_WARNING); 225 (this.signinUIState_ == SIGNIN_UI_STATE.WRONG_HWID_WARNING);
213 var isSamlPasswordConfirm = 226 var isSamlPasswordConfirm =
214 (this.signinUIState_ == SIGNIN_UI_STATE.SAML_PASSWORD_CONFIRM); 227 (this.signinUIState_ == SIGNIN_UI_STATE.SAML_PASSWORD_CONFIRM);
228 var isEnrollingConsumerManagement = (this.signinUIState_ ==
229 SIGNIN_UI_STATE.CONSUMER_MANAGEMENT_ENROLLMENT);
215 var isMultiProfilesUI = 230 var isMultiProfilesUI =
216 (Oobe.getInstance().displayType == DISPLAY_TYPE.USER_ADDING); 231 (Oobe.getInstance().displayType == DISPLAY_TYPE.USER_ADDING);
217 var isLockScreen = 232 var isLockScreen =
218 (Oobe.getInstance().displayType == DISPLAY_TYPE.LOCK); 233 (Oobe.getInstance().displayType == DISPLAY_TYPE.LOCK);
219 234
220 $('add-user-button').hidden = 235 $('add-user-button').hidden =
221 !accountPickerIsActive || isMultiProfilesUI || isLockScreen; 236 !accountPickerIsActive || isMultiProfilesUI || isLockScreen;
222 $('cancel-add-user-button').hidden = accountPickerIsActive || 237 $('cancel-add-user-button').hidden = accountPickerIsActive ||
223 !this.allowCancel_ || 238 !this.allowCancel_ ||
224 wrongHWIDWarningIsActive || 239 wrongHWIDWarningIsActive ||
225 isMultiProfilesUI; 240 isMultiProfilesUI;
226 $('guest-user-header-bar-item').hidden = gaiaIsActive || 241 $('guest-user-header-bar-item').hidden = gaiaIsActive ||
227 managedUserCreationDialogIsActive || 242 managedUserCreationDialogIsActive ||
228 !this.showGuest_ || 243 !this.showGuest_ ||
229 wrongHWIDWarningIsActive || 244 wrongHWIDWarningIsActive ||
230 isSamlPasswordConfirm || 245 isSamlPasswordConfirm ||
231 isMultiProfilesUI; 246 isMultiProfilesUI;
232 $('sign-out-user-item').hidden = !isLockScreen; 247 $('sign-out-user-item').hidden = !isLockScreen;
233 248
234 $('add-user-header-bar-item').hidden = 249 $('add-user-header-bar-item').hidden =
235 $('add-user-button').hidden && $('cancel-add-user-button').hidden; 250 $('add-user-button').hidden && $('cancel-add-user-button').hidden;
236 $('apps-header-bar-item').hidden = !this.hasApps_ || 251 $('apps-header-bar-item').hidden = !this.hasApps_ ||
237 (!gaiaIsActive && !accountPickerIsActive); 252 (!gaiaIsActive && !accountPickerIsActive);
238 $('cancel-multiple-sign-in-item').hidden = !isMultiProfilesUI; 253 $('cancel-multiple-sign-in-item').hidden = !isMultiProfilesUI;
254 $('cancel-consumer-management-enrollment').hidden =
255 !isEnrollingConsumerManagement;
239 256
240 if (!Oobe.getInstance().newKioskUI) { 257 if (!Oobe.getInstance().newKioskUI) {
241 if (!$('apps-header-bar-item').hidden) 258 if (!$('apps-header-bar-item').hidden)
242 $('show-apps-button').didShow(); 259 $('show-apps-button').didShow();
243 } 260 }
244 }, 261 },
245 262
246 /** 263 /**
247 * Animates Header bar to hide from the screen. 264 * Animates Header bar to hide from the screen.
248 * 265 *
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 */ 314 */
298 HeaderBar.animateOut = function(callback) { 315 HeaderBar.animateOut = function(callback) {
299 $('login-header-bar').animateOut(callback); 316 $('login-header-bar').animateOut(callback);
300 }; 317 };
301 318
302 /** 319 /**
303 * Convenience wrapper of animateIn. 320 * Convenience wrapper of animateIn.
304 */ 321 */
305 HeaderBar.animateIn = function(callback) { 322 HeaderBar.animateIn = function(callback) {
306 $('login-header-bar').animateIn(callback); 323 $('login-header-bar').animateIn(callback);
307 } 324 };
308 325
309 return { 326 return {
310 HeaderBar: HeaderBar 327 HeaderBar: HeaderBar
311 }; 328 };
312 }); 329 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698