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

Unified Diff: chrome/browser/resources/chromeos/login/screen_error_message.js

Issue 1411423006: Simplifed logic of showing/hiding cancel buttons on login screens. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small fix. Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/chromeos/login/screen_error_message.js
diff --git a/chrome/browser/resources/chromeos/login/screen_error_message.js b/chrome/browser/resources/chromeos/login/screen_error_message.js
index 954c915f676df7ef99c36c02aade57b619f82efb..fffdc6e87d136968964b91483fa7b155fac5ad2b 100644
--- a/chrome/browser/resources/chromeos/login/screen_error_message.js
+++ b/chrome/browser/resources/chromeos/login/screen_error_message.js
@@ -89,6 +89,16 @@ login.createScreen('ErrorMessageScreen', 'error-message', function() {
// Error screen initial error state.
error_state_: ERROR_STATE.UNKNOWN,
+ // Whether the screen can be cancelled.
+ cancelable_: false,
+ get cancelable() {
+ return this.cancelable_;
+ },
+ set cancelable(value) {
+ this.cancelable_ = value;
+ $('error-close-button').hidden = !value;
+ },
+
/** @override */
decorate: function() {
cr.ui.DropDown.decorate($('offline-networks-list'));
@@ -222,7 +232,7 @@ login.createScreen('ErrorMessageScreen', 'error-message', function() {
cr.ui.Oobe.clearErrors();
cr.ui.DropDown.show('offline-networks-list', false);
$('login-header-bar').signinUIState = SIGNIN_UI_STATE.ERROR;
- $('error-close-button').hidden = !$('login-header-bar').allowCancel;
+ this.cancelable = $('pod-row').pods.length;
},
/**
@@ -423,7 +433,7 @@ login.createScreen('ErrorMessageScreen', 'error-message', function() {
* Cancels error screen and drops to user pods.
*/
cancel: function() {
- if ($('login-header-bar').allowCancel)
+ if (this.cancelable)
Oobe.showUserPods();
}
};

Powered by Google App Engine
This is Rietveld 408576698