| 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 a820afa77e2ff2b96581cf3c49c45ea5dd958a45..b7c4784acf54d60f8282856914c2e68ade0191eb 100644
|
| --- a/chrome/browser/resources/md_user_manager/import_supervised_user.js
|
| +++ b/chrome/browser/resources/md_user_manager/import_supervised_user.js
|
| @@ -3,7 +3,7 @@
|
| // found in the LICENSE file.
|
|
|
| /**
|
| - * @fileoverview 'import-supervised-user' is a popup that allows user to select
|
| + * @fileoverview 'import-supervised-user' is a dialog that allows user to select
|
| * a supervised profile from a list of profiles to import on the current device.
|
| */
|
| (function() {
|
| @@ -22,16 +22,6 @@ Polymer({
|
|
|
| properties: {
|
| /**
|
| - * True if the element is currently hidden. The element toggles this in
|
| - * order to display itself or hide itself once done.
|
| - * @private {boolean}
|
| - */
|
| - popupHidden_: {
|
| - type: Boolean,
|
| - value: true
|
| - },
|
| -
|
| - /**
|
| * The currently signed in user and the custodian.
|
| * @private {?SignedInUser}
|
| */
|
| @@ -60,7 +50,7 @@ Polymer({
|
| },
|
|
|
| /**
|
| - * Displays the popup.
|
| + * Displays the dialog.
|
| * @param {(!SignedInUser|undefined)} signedInUser
|
| * @param {!Array<!SupervisedUser>} supervisedUsers
|
| */
|
| @@ -76,14 +66,7 @@ Polymer({
|
|
|
| this.signedInUser_ = signedInUser || null;
|
| if (this.signedInUser_)
|
| - this.popupHidden_ = false;
|
| -
|
| - if (this.popupHidden_)
|
| - return;
|
| -
|
| - this.async(function() {
|
| - this.$$('paper-listbox').focus();
|
| - }.bind(this));
|
| + this.$.dialog.open();
|
| },
|
|
|
| /**
|
| @@ -99,11 +82,11 @@ Polymer({
|
| },
|
|
|
| /**
|
| - * Hides the popup.
|
| + * Hides the dialog.
|
| * @private
|
| */
|
| onCancelTap_: function() {
|
| - this.popupHidden_ = true;
|
| + this.$.dialog.close();
|
| },
|
|
|
| /**
|
| @@ -123,7 +106,7 @@ Polymer({
|
| onImportTap_: function() {
|
| var supervisedUser = this.supervisedUsers_[this.supervisedUserIndex_];
|
| if (this.signedInUser_ && supervisedUser) {
|
| - this.popupHidden_ = true;
|
| + this.$.dialog.close();
|
| // Event is caught by create-profile.
|
| this.fire('import', {supervisedUser: supervisedUser,
|
| signedInUser: this.signedInUser_});
|
|
|