Chromium Code Reviews| Index: chrome/browser/resources/chromeos/login/oobe_screen_reset.js |
| diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_reset.js b/chrome/browser/resources/chromeos/login/oobe_screen_reset.js |
| index 0a36ed9d1b334f7e6afb7949ed2dd4c9a25d06ec..20ee9c8a7247fb966692cc6600a53b0485823e40 100644 |
| --- a/chrome/browser/resources/chromeos/login/oobe_screen_reset.js |
| +++ b/chrome/browser/resources/chromeos/login/oobe_screen_reset.js |
| @@ -82,6 +82,7 @@ login.createScreen('ResetScreen', 'reset', function() { |
| CONTEXT_KEY_IS_OFFICIAL_BUILD, |
| function(isOfficial) { |
| $('powerwash-help-link').setAttribute('hidden', !isOfficial); |
| + $('oobe-reset-md').isOfficial_ = isOfficial; |
| } |
| ); |
| this.context.addObserver( |
| @@ -164,6 +165,8 @@ login.createScreen('ResetScreen', 'reset', function() { |
| */ |
| get defaultControl() { |
| // choose |
| + if (loadTimeData.getString('newOobeUI') == 'on') |
|
jdufault
2017/04/06 01:04:52
create helper function for loadTimeData.getString(
Wenzhao (Colin) Zang
2017/04/07 02:55:36
Done.
|
| + return $('oobe-reset-md'); |
| if (this.context.get(CONTEXT_KEY_SCREEN_STATE, |
| this.RESET_SCREEN_STATE.RESTART_REQUIRED) == |
| this.RESET_SCREEN_STATE.RESTART_REQUIRED) |
| @@ -186,16 +189,36 @@ login.createScreen('ResetScreen', 'reset', function() { |
| }, |
| /** |
| + * This method takes care of switching to material-design OOBE. |
| + * @private |
| + */ |
| + setMDMode_: function() { |
|
jdufault
2017/04/06 01:04:52
nit: showMdMode_
Wenzhao (Colin) Zang
2017/04/07 02:55:36
Since setMDMode_ is used in all other files, I wan
|
| + var useMDOobe = (loadTimeData.getString('newOobeUI') == 'on'); |
|
jdufault
2017/04/06 01:04:52
nit: useMdOobe
Wenzhao (Colin) Zang
2017/04/07 02:55:36
Acknowledged.
|
| + $('oobe-reset-md').hidden = !useMDOobe; |
| + $('reset-confirm-overlay-md').hidden = !useMDOobe; |
| + $('oobe-reset').hidden = useMDOobe; |
| + $('reset-confirm-overlay').hidden = useMDOobe; |
| + if (useMDOobe) { |
| + $('reset').setAttribute('md-mode', 'true'); |
| + $('overlay-reset').setAttribute('md-mode', 'true'); |
| + } else { |
| + $('reset').removeAttribute('md-mode'); |
| + $('overlay-reset').removeAttribute('md-mode'); |
| + } |
| + }, |
| + |
| + /** |
| * Event handler that is invoked just before the screen in shown. |
| * @param {Object} data Screen init payload. |
| */ |
| onBeforeShow: function(data) { |
| + this.setMDMode_(); |
| }, |
| /** |
| - * Sets css style for corresponding state of the screen. |
| - * @private |
| - */ |
| + * Sets css style for corresponding state of the screen. |
| + * @private |
| + */ |
| setDialogView_: function(state) { |
| state = this.ui_state; |
| var resetOverlay = $('reset-confirm-overlay'); |
| @@ -217,6 +240,22 @@ login.createScreen('ResetScreen', 'reset', function() { |
| resetOverlay.classList.toggle( |
| 'rollback-proposal-view', |
| state == this.RESET_SCREEN_UI_STATE.ROLLBACK_PROPOSAL); |
| + var resetMd = $('oobe-reset-md'); |
| + var resetOverlayMd = $('reset-confirm-overlay-md'); |
| + if (state == this.RESET_SCREEN_UI_STATE.RESTART_REQUIRED) { |
| + resetMd.uiState_ = 1; |
| + } |
| + if (state == this.RESET_SCREEN_UI_STATE.POWERWASH_PROPOSAL) { |
| + resetMd.uiState_ = 2; |
| + resetOverlayMd.isPowerwashView_ = true; |
| + } |
| + if (state == this.RESET_SCREEN_UI_STATE.ROLLBACK_PROPOSAL) { |
| + resetMd.uiState_ = 4; |
| + resetOverlayMd.isPowerwashView_ = false; |
| + } |
| + if (state == this.RESET_SCREEN_UI_STATE.REVERT_PROMISE) { |
| + resetMd.uiState_ = 8; |
| + } |
| }, |
| setRollbackOptionView: function() { |