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

Side by Side Diff: ui/login/display_manager.js

Issue 491263002: UI flow rework for device reset options. Reset made available from gaia screen. Tests adapted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ShowAndCancelTest fixed. Created 6 years, 3 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
« no previous file with comments | « tools/metrics/histograms/histograms.xml ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 28 matching lines...) Expand all
39 /** @const */ var ACCELERATOR_FOCUS_PREV = 'focus_prev'; 39 /** @const */ var ACCELERATOR_FOCUS_PREV = 'focus_prev';
40 /** @const */ var ACCELERATOR_FOCUS_NEXT = 'focus_next'; 40 /** @const */ var ACCELERATOR_FOCUS_NEXT = 'focus_next';
41 /** @const */ var ACCELERATOR_DEVICE_REQUISITION = 'device_requisition'; 41 /** @const */ var ACCELERATOR_DEVICE_REQUISITION = 'device_requisition';
42 /** @const */ var ACCELERATOR_DEVICE_REQUISITION_REMORA = 42 /** @const */ var ACCELERATOR_DEVICE_REQUISITION_REMORA =
43 'device_requisition_remora'; 43 'device_requisition_remora';
44 /** @const */ var ACCELERATOR_DEVICE_REQUISITION_SHARK = 44 /** @const */ var ACCELERATOR_DEVICE_REQUISITION_SHARK =
45 'device_requisition_shark'; 45 'device_requisition_shark';
46 /** @const */ var ACCELERATOR_APP_LAUNCH_BAILOUT = 'app_launch_bailout'; 46 /** @const */ var ACCELERATOR_APP_LAUNCH_BAILOUT = 'app_launch_bailout';
47 /** @const */ var ACCELERATOR_APP_LAUNCH_NETWORK_CONFIG = 47 /** @const */ var ACCELERATOR_APP_LAUNCH_NETWORK_CONFIG =
48 'app_launch_network_config'; 48 'app_launch_network_config';
49 /** @const */ var ACCELERATOR_SHOW_ROLLBACK_ON_RESET =
50 'show_rollback_on_reset_screen';
51 /** @const */ var ACCELERATOR_HIDE_ROLLBACK_ON_RESET =
52 'hide_rollback_on_reset_screen';
49 53
50 /* Signin UI state constants. Used to control header bar UI. */ 54 /* Signin UI state constants. Used to control header bar UI. */
51 /** @const */ var SIGNIN_UI_STATE = { 55 /** @const */ var SIGNIN_UI_STATE = {
52 HIDDEN: 0, 56 HIDDEN: 0,
53 GAIA_SIGNIN: 1, 57 GAIA_SIGNIN: 1,
54 ACCOUNT_PICKER: 2, 58 ACCOUNT_PICKER: 2,
55 WRONG_HWID_WARNING: 3, 59 WRONG_HWID_WARNING: 3,
56 SUPERVISED_USER_CREATION_FLOW: 4, 60 SUPERVISED_USER_CREATION_FLOW: 4,
57 SAML_PASSWORD_CONFIRM: 5, 61 SAML_PASSWORD_CONFIRM: 5,
58 CONSUMER_MANAGEMENT_ENROLLMENT: 6, 62 CONSUMER_MANAGEMENT_ENROLLMENT: 6,
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 } else if (name == ACCELERATOR_DEVICE_REQUISITION_SHARK) { 369 } else if (name == ACCELERATOR_DEVICE_REQUISITION_SHARK) {
366 if (this.isOobeUI()) 370 if (this.isOobeUI())
367 this.showDeviceRequisitionRemoraPrompt_( 371 this.showDeviceRequisitionRemoraPrompt_(
368 'deviceRequisitionSharkPromptText', 'shark'); 372 'deviceRequisitionSharkPromptText', 'shark');
369 } else if (name == ACCELERATOR_APP_LAUNCH_BAILOUT) { 373 } else if (name == ACCELERATOR_APP_LAUNCH_BAILOUT) {
370 if (currentStepId == SCREEN_APP_LAUNCH_SPLASH) 374 if (currentStepId == SCREEN_APP_LAUNCH_SPLASH)
371 chrome.send('cancelAppLaunch'); 375 chrome.send('cancelAppLaunch');
372 } else if (name == ACCELERATOR_APP_LAUNCH_NETWORK_CONFIG) { 376 } else if (name == ACCELERATOR_APP_LAUNCH_NETWORK_CONFIG) {
373 if (currentStepId == SCREEN_APP_LAUNCH_SPLASH) 377 if (currentStepId == SCREEN_APP_LAUNCH_SPLASH)
374 chrome.send('networkConfigRequest'); 378 chrome.send('networkConfigRequest');
379 } else if (name == ACCELERATOR_SHOW_ROLLBACK_ON_RESET) {
380 if (currentStepId == SCREEN_OOBE_RESET)
381 chrome.send('showRollbackOnResetScreen');
382 } else if (name == ACCELERATOR_HIDE_ROLLBACK_ON_RESET) {
383 if (currentStepId == SCREEN_OOBE_RESET)
384 chrome.send('hideRollbackOnResetScreen');
375 } 385 }
376 386
377 if (!this.forceKeyboardFlow_) 387 if (!this.forceKeyboardFlow_)
378 return; 388 return;
379 389
380 // Handle special accelerators for keyboard enhanced navigation flow. 390 // Handle special accelerators for keyboard enhanced navigation flow.
381 if (name == ACCELERATOR_FOCUS_PREV) 391 if (name == ACCELERATOR_FOCUS_PREV)
382 keyboard.raiseKeyFocusPrevious(document.activeElement); 392 keyboard.raiseKeyFocusPrevious(document.activeElement);
383 else if (name == ACCELERATOR_FOCUS_NEXT) 393 else if (name == ACCELERATOR_FOCUS_NEXT)
384 keyboard.raiseKeyFocusNext(document.activeElement); 394 keyboard.raiseKeyFocusNext(document.activeElement);
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after
1032 */ 1042 */
1033 DisplayManager.refocusCurrentPod = function() { 1043 DisplayManager.refocusCurrentPod = function() {
1034 $('pod-row').refocusCurrentPod(); 1044 $('pod-row').refocusCurrentPod();
1035 }; 1045 };
1036 1046
1037 // Export 1047 // Export
1038 return { 1048 return {
1039 DisplayManager: DisplayManager 1049 DisplayManager: DisplayManager
1040 }; 1050 };
1041 }); 1051 });
OLDNEW
« no previous file with comments | « tools/metrics/histograms/histograms.xml ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698