Index: chrome/browser/resources/md_user_manager/import_supervised_user.js |
diff --git a/chrome/browser/resources/md_user_manager/import_supervised_user.js b/chrome/browser/resources/md_user_manager/import_supervised_user.js |
index 27491fa55a80f5dcb3e282b5f684d6498e9e2317..7ffa15638e27d99d20c57c4dde0afd028afa3c4c 100644 |
--- a/chrome/browser/resources/md_user_manager/import_supervised_user.js |
+++ b/chrome/browser/resources/md_user_manager/import_supervised_user.js |
@@ -50,11 +50,6 @@ Polymer({ |
supervisedUserIndex_: {type: Number, value: NO_USER_SELECTED} |
}, |
- /** override */ |
- ready: function() { |
- this.$.dialog.lastFocusableNode = this.$.cancel; |
- }, |
- |
/** |
* Displays the dialog. |
* @param {(!SignedInUser|undefined)} signedInUser |
@@ -72,20 +67,16 @@ Polymer({ |
this.signedInUser_ = signedInUser || null; |
if (this.signedInUser_) |
- this.$.dialog.open(); |
+ this.$.dialog.showModal(); |
}, |
/** |
- * param {number} supervisedUserIndex Index of the selected supervised user. |
- * @private |
+ * @param {number} supervisedUserIndex Index of the selected supervised user. |
* @return {boolean} Whether the 'Import' button should be disabled. |
+ * @private |
*/ |
isImportDisabled_: function(supervisedUserIndex) { |
- var disabled = supervisedUserIndex == NO_USER_SELECTED; |
- if (!disabled) { |
- this.$.dialog.lastFocusableNode = this.$.import; |
- } |
- return disabled; |
+ return supervisedUserIndex == NO_USER_SELECTED; |
}, |
/** |
@@ -102,6 +93,11 @@ Polymer({ |
'import', |
{supervisedUser: supervisedUser, signedInUser: this.signedInUser_}); |
} |
- } |
+ }, |
+ |
+ /** @private */ |
+ onCancelTap_: function() { |
+ this.$.dialog.close(); |
+ }, |
}); |
})(); |