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

Side by Side Diff: trunk/src/chrome/browser/resources/login/display_manager.js

Issue 313923005: Revert 273875 "Remove the option to skip auto-update checks on OOBE." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 Display manager for WebUI OOBE and login. 6 * @fileoverview Display manager for WebUI OOBE and login.
7 */ 7 */
8 8
9 // TODO(xiyuan): Find a better to share those constants. 9 // TODO(xiyuan): Find a better to share those constants.
10 /** @const */ var SCREEN_OOBE_NETWORK = 'connect'; 10 /** @const */ var SCREEN_OOBE_NETWORK = 'connect';
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 handleAccelerator: function(name) { 332 handleAccelerator: function(name) {
333 var currentStepId = this.screens_[this.currentStep_]; 333 var currentStepId = this.screens_[this.currentStep_];
334 if (name == ACCELERATOR_CANCEL) { 334 if (name == ACCELERATOR_CANCEL) {
335 if (this.currentScreen.cancel) { 335 if (this.currentScreen.cancel) {
336 this.currentScreen.cancel(); 336 this.currentScreen.cancel();
337 } 337 }
338 } else if (name == ACCELERATOR_ENROLLMENT) { 338 } else if (name == ACCELERATOR_ENROLLMENT) {
339 if (currentStepId == SCREEN_GAIA_SIGNIN || 339 if (currentStepId == SCREEN_GAIA_SIGNIN ||
340 currentStepId == SCREEN_ACCOUNT_PICKER) { 340 currentStepId == SCREEN_ACCOUNT_PICKER) {
341 chrome.send('toggleEnrollmentScreen'); 341 chrome.send('toggleEnrollmentScreen');
342 } else if (currentStepId == SCREEN_OOBE_NETWORK ||
343 currentStepId == SCREEN_OOBE_EULA) {
344 // In this case update check will be skipped and OOBE will
345 // proceed straight to enrollment screen when EULA is accepted.
346 chrome.send('skipUpdateEnrollAfterEula');
342 } else if (currentStepId == SCREEN_OOBE_ENROLLMENT) { 347 } else if (currentStepId == SCREEN_OOBE_ENROLLMENT) {
343 // This accelerator is also used to manually cancel auto-enrollment. 348 // This accelerator is also used to manually cancel auto-enrollment.
344 if (this.currentScreen.cancelAutoEnrollment) 349 if (this.currentScreen.cancelAutoEnrollment)
345 this.currentScreen.cancelAutoEnrollment(); 350 this.currentScreen.cancelAutoEnrollment();
346 } 351 }
347 } else if (name == ACCELERATOR_KIOSK_ENABLE) { 352 } else if (name == ACCELERATOR_KIOSK_ENABLE) {
348 if (currentStepId == SCREEN_GAIA_SIGNIN || 353 if (currentStepId == SCREEN_GAIA_SIGNIN ||
349 currentStepId == SCREEN_ACCOUNT_PICKER) { 354 currentStepId == SCREEN_ACCOUNT_PICKER) {
350 chrome.send('toggleKioskEnableScreen'); 355 chrome.send('toggleKioskEnableScreen');
351 } 356 }
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after
1023 */ 1028 */
1024 DisplayManager.refocusCurrentPod = function() { 1029 DisplayManager.refocusCurrentPod = function() {
1025 $('pod-row').refocusCurrentPod(); 1030 $('pod-row').refocusCurrentPod();
1026 }; 1031 };
1027 1032
1028 // Export 1033 // Export
1029 return { 1034 return {
1030 DisplayManager: DisplayManager 1035 DisplayManager: DisplayManager
1031 }; 1036 };
1032 }); 1037 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698