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

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

Issue 10096012: [cros] Add Ctrl+Alt+E shortcut to Welcome/EULA screen that cancels update and starts with enrollment (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 8 years, 8 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 /** 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 SCREEN_GAIA_SIGNIN = 'gaia-signin'; 10 /** @const */ var SCREEN_OOBE_NETWORK = 'connect';
11 const SCREEN_ACCOUNT_PICKER = 'account-picker'; 11 /** @const */ var SCREEN_OOBE_EULA = 'eula';
12 /** @const */ var SCREEN_GAIA_SIGNIN = 'gaia-signin';
13 /** @const */ var SCREEN_ACCOUNT_PICKER = 'account-picker';
12 14
13 /* Accelerator identifiers. Must be kept in sync with webui_login_view.cc. */ 15 /* Accelerator identifiers. Must be kept in sync with webui_login_view.cc. */
14 const ACCELERATOR_ACCESSIBILITY = 'accessibility'; 16 /** @const */ var ACCELERATOR_ACCESSIBILITY = 'accessibility';
15 const ACCELERATOR_CANCEL = 'cancel'; 17 /** @const */ var ACCELERATOR_CANCEL = 'cancel';
16 const ACCELERATOR_ENROLLMENT = 'enrollment'; 18 /** @const */ var ACCELERATOR_ENROLLMENT = 'enrollment';
17 const ACCELERATOR_EXIT = 'exit'; 19 /** @const */ var ACCELERATOR_EXIT = 'exit';
18 const ACCELERATOR_VERSION = 'version'; 20 /** @const */ var ACCELERATOR_VERSION = 'version';
19 21
20 /* Help topic identifiers. */ 22 /* Help topic identifiers. */
21 const HELP_TOPIC_ENTERPRISE_REPORTING = 2535613; 23 /** @const */ var HELP_TOPIC_ENTERPRISE_REPORTING = 2535613;
22 24
23 cr.define('cr.ui.login', function() { 25 cr.define('cr.ui.login', function() {
24 var Bubble = cr.ui.Bubble; 26 var Bubble = cr.ui.Bubble;
25 27
26 /** 28 /**
27 * Constructor a display manager that manages initialization of screens, 29 * Constructor a display manager that manages initialization of screens,
28 * transitions, error messages display. 30 * transitions, error messages display.
29 * 31 *
30 * @constructor 32 * @constructor
31 */ 33 */
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 $('version-labels').hidden = !show; 77 $('version-labels').hidden = !show;
76 this.allowToggleVersion_ = !show; 78 this.allowToggleVersion_ = !show;
77 }, 79 },
78 80
79 /** 81 /**
80 * Handle accelerators. 82 * Handle accelerators.
81 * @param {string} name Accelerator name. 83 * @param {string} name Accelerator name.
82 */ 84 */
83 handleAccelerator: function(name) { 85 handleAccelerator: function(name) {
84 if (name == ACCELERATOR_ACCESSIBILITY) { 86 if (name == ACCELERATOR_ACCESSIBILITY) {
85 chrome.send('toggleAccessibility', []); 87 chrome.send('toggleAccessibility');
86 } else if (name == ACCELERATOR_CANCEL) { 88 } else if (name == ACCELERATOR_CANCEL) {
87 if (this.currentScreen.cancel) { 89 if (this.currentScreen.cancel) {
88 this.currentScreen.cancel(); 90 this.currentScreen.cancel();
89 } 91 }
90 } else if (name == ACCELERATOR_ENROLLMENT) { 92 } else if (name == ACCELERATOR_ENROLLMENT) {
91 var currentStepId = this.screens_[this.currentStep_]; 93 var currentStepId = this.screens_[this.currentStep_];
92 if (currentStepId == SCREEN_GAIA_SIGNIN) 94 if (currentStepId == SCREEN_GAIA_SIGNIN) {
93 chrome.send('toggleEnrollmentScreen', []); 95 chrome.send('toggleEnrollmentScreen');
96 } else if (currentStepId == SCREEN_OOBE_NETWORK ||
97 currentStepId == SCREEN_OOBE_EULA) {
98 // In this case update check will be skipped and OOBE will
99 // proceed straight to enrollment screen when EULA is accepted.
100 chrome.send('skipUpdateEnrollAfterEula');
Ivan Korotkov 2012/04/16 16:42:14 Suggestion: indicate somehow that we've activated
Nikita (slow) 2012/04/16 16:45:58 Ok, I'll ping Glen Wilson on that.
101 }
94 } else if (name == ACCELERATOR_EXIT) { 102 } else if (name == ACCELERATOR_EXIT) {
95 if (this.currentScreen.exit) { 103 if (this.currentScreen.exit) {
96 this.currentScreen.exit(); 104 this.currentScreen.exit();
97 } 105 }
98 } else if (name == ACCELERATOR_VERSION) { 106 } else if (name == ACCELERATOR_VERSION) {
99 if (this.allowToggleVersion_) 107 if (this.allowToggleVersion_)
100 $('version-labels').hidden = !$('version-labels').hidden; 108 $('version-labels').hidden = !$('version-labels').hidden;
101 } 109 }
102 }, 110 },
103 111
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 }); 431 });
424 } 432 }
425 } 433 }
426 }; 434 };
427 435
428 // Export 436 // Export
429 return { 437 return {
430 DisplayManager: DisplayManager 438 DisplayManager: DisplayManager
431 }; 439 };
432 }); 440 });
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.cc ('k') | chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698