OLD | NEW |
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 Device reset screen implementation. | 6 * @fileoverview Device reset screen implementation. |
7 */ | 7 */ |
8 | 8 |
9 login.createScreen('ResetScreen', 'reset', function() { | 9 login.createScreen('ResetScreen', 'reset', function() { |
10 var USER_ACTION_CANCEL_RESET = 'cancel-reset'; | 10 var USER_ACTION_CANCEL_RESET = 'cancel-reset'; |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 event: 'click' | 51 event: 'click' |
52 }); | 52 }); |
53 this.declareUserAction($('reset-confirm-commit'), | 53 this.declareUserAction($('reset-confirm-commit'), |
54 { action_id: USER_ACTION_POWERWASH_PRESSED, | 54 { action_id: USER_ACTION_POWERWASH_PRESSED, |
55 event: 'click' | 55 event: 'click' |
56 }); | 56 }); |
57 | 57 |
58 this.context.addObserver( | 58 this.context.addObserver( |
59 CONTEXT_KEY_SCREEN_STATE, | 59 CONTEXT_KEY_SCREEN_STATE, |
60 function(state) { | 60 function(state) { |
| 61 if (Oobe.getInstance().currentScreen != this) { |
| 62 setTimeout(function() { |
| 63 Oobe.resetSigninUI(false); |
| 64 Oobe.showScreen({id: SCREEN_OOBE_RESET}); |
| 65 }, 0); |
| 66 } |
61 if (state == self.RESET_SCREEN_STATE.RESTART_REQUIRED) | 67 if (state == self.RESET_SCREEN_STATE.RESTART_REQUIRED) |
62 self.ui_state = self.RESET_SCREEN_UI_STATE.RESTART_REQUIRED; | 68 self.ui_state = self.RESET_SCREEN_UI_STATE.RESTART_REQUIRED; |
63 if (state == self.RESET_SCREEN_STATE.REVERT_PROMISE) | 69 if (state == self.RESET_SCREEN_STATE.REVERT_PROMISE) |
64 self.ui_state = self.RESET_SCREEN_UI_STATE.REVERT_PROMISE; | 70 self.ui_state = self.RESET_SCREEN_UI_STATE.REVERT_PROMISE; |
65 else if (state == self.RESET_SCREEN_STATE.POWERWASH_PROPOSAL) | 71 else if (state == self.RESET_SCREEN_STATE.POWERWASH_PROPOSAL) |
66 self.ui_state = self.RESET_SCREEN_UI_STATE.POWERWASH_PROPOSAL; | 72 self.ui_state = self.RESET_SCREEN_UI_STATE.POWERWASH_PROPOSAL; |
67 self.setDialogView_(); | 73 self.setDialogView_(); |
68 if (state == self.RESET_SCREEN_STATE.REVERT_PROMISE) { | 74 if (state == self.RESET_SCREEN_STATE.REVERT_PROMISE) { |
69 announceAccessibleMessage( | 75 announceAccessibleMessage( |
70 loadTimeData.getString('resetRevertSpinnerMessage')); | 76 loadTimeData.getString('resetRevertSpinnerMessage')); |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
229 } else { | 235 } else { |
230 // hide rollback option | 236 // hide rollback option |
231 $('reset-toconfirm-button').textContent = loadTimeData.getString( | 237 $('reset-toconfirm-button').textContent = loadTimeData.getString( |
232 'resetButtonPowerwash'); | 238 'resetButtonPowerwash'); |
233 this.ui_state = this.RESET_SCREEN_UI_STATE.POWERWASH_PROPOSAL; | 239 this.ui_state = this.RESET_SCREEN_UI_STATE.POWERWASH_PROPOSAL; |
234 } | 240 } |
235 this.setDialogView_(); | 241 this.setDialogView_(); |
236 } | 242 } |
237 }; | 243 }; |
238 }); | 244 }); |
OLD | NEW |