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

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: Added owner email check. 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',
bartfab (slow) 2014/08/04 17:40:52 Nit: This indentation is incorrect. Either indent
davidyu 2014/08/05 07:24:05 Done.
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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 supervisedUserCreationDialogIsActive = 222 var supervisedUserCreationDialogIsActive =
210 (this.signinUIState_ == 223 (this.signinUIState_ ==
211 SIGNIN_UI_STATE.SUPERVISED_USER_CREATION_FLOW); 224 SIGNIN_UI_STATE.SUPERVISED_USER_CREATION_FLOW);
212 var wrongHWIDWarningIsActive = 225 var wrongHWIDWarningIsActive =
213 (this.signinUIState_ == SIGNIN_UI_STATE.WRONG_HWID_WARNING); 226 (this.signinUIState_ == SIGNIN_UI_STATE.WRONG_HWID_WARNING);
214 var isSamlPasswordConfirm = 227 var isSamlPasswordConfirm =
215 (this.signinUIState_ == SIGNIN_UI_STATE.SAML_PASSWORD_CONFIRM); 228 (this.signinUIState_ == SIGNIN_UI_STATE.SAML_PASSWORD_CONFIRM);
229 var isEnrollingConsumerManagement = (this.signinUIState_ ==
230 SIGNIN_UI_STATE.CONSUMER_MANAGEMENT_ENROLLMENT);
216 var isMultiProfilesUI = 231 var isMultiProfilesUI =
217 (Oobe.getInstance().displayType == DISPLAY_TYPE.USER_ADDING); 232 (Oobe.getInstance().displayType == DISPLAY_TYPE.USER_ADDING);
218 var isLockScreen = 233 var isLockScreen =
219 (Oobe.getInstance().displayType == DISPLAY_TYPE.LOCK); 234 (Oobe.getInstance().displayType == DISPLAY_TYPE.LOCK);
220 235
221 $('add-user-button').hidden = 236 $('add-user-button').hidden =
222 !accountPickerIsActive || isMultiProfilesUI || isLockScreen; 237 !accountPickerIsActive || isMultiProfilesUI || isLockScreen;
223 $('cancel-add-user-button').hidden = accountPickerIsActive || 238 $('cancel-add-user-button').hidden = accountPickerIsActive ||
224 !this.allowCancel_ || 239 !this.allowCancel_ ||
225 wrongHWIDWarningIsActive || 240 wrongHWIDWarningIsActive ||
226 isMultiProfilesUI; 241 isMultiProfilesUI;
227 $('guest-user-header-bar-item').hidden = gaiaIsActive || 242 $('guest-user-header-bar-item').hidden = gaiaIsActive ||
228 supervisedUserCreationDialogIsActive || 243 supervisedUserCreationDialogIsActive ||
229 !this.showGuest_ || 244 !this.showGuest_ ||
230 wrongHWIDWarningIsActive || 245 wrongHWIDWarningIsActive ||
231 isSamlPasswordConfirm || 246 isSamlPasswordConfirm ||
232 isMultiProfilesUI; 247 isMultiProfilesUI;
233 $('sign-out-user-item').hidden = !isLockScreen; 248 $('sign-out-user-item').hidden = !isLockScreen;
234 249
235 $('add-user-header-bar-item').hidden = 250 $('add-user-header-bar-item').hidden =
236 $('add-user-button').hidden && $('cancel-add-user-button').hidden; 251 $('add-user-button').hidden && $('cancel-add-user-button').hidden;
237 $('apps-header-bar-item').hidden = !this.hasApps_ || 252 $('apps-header-bar-item').hidden = !this.hasApps_ ||
238 (!gaiaIsActive && !accountPickerIsActive); 253 (!gaiaIsActive && !accountPickerIsActive);
239 $('cancel-multiple-sign-in-item').hidden = !isMultiProfilesUI; 254 $('cancel-multiple-sign-in-item').hidden = !isMultiProfilesUI;
255 $('cancel-consumer-management-enrollment').hidden =
256 !isEnrollingConsumerManagement;
240 257
241 if (!Oobe.getInstance().newKioskUI) { 258 if (!Oobe.getInstance().newKioskUI) {
242 if (!$('apps-header-bar-item').hidden) 259 if (!$('apps-header-bar-item').hidden)
243 $('show-apps-button').didShow(); 260 $('show-apps-button').didShow();
244 } 261 }
245 }, 262 },
246 263
247 /** 264 /**
248 * Animates Header bar to hide from the screen. 265 * Animates Header bar to hide from the screen.
249 * 266 *
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 * Convenience wrapper of animateIn. 321 * Convenience wrapper of animateIn.
305 */ 322 */
306 HeaderBar.animateIn = function(callback) { 323 HeaderBar.animateIn = function(callback) {
307 $('login-header-bar').animateIn(callback); 324 $('login-header-bar').animateIn(callback);
308 }; 325 };
309 326
310 return { 327 return {
311 HeaderBar: HeaderBar 328 HeaderBar: HeaderBar
312 }; 329 };
313 }); 330 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698