Chromium Code Reviews| Index: chrome/browser/resources/options/manage_profile_overlay.js |
| diff --git a/chrome/browser/resources/options/manage_profile_overlay.js b/chrome/browser/resources/options/manage_profile_overlay.js |
| index 4e9ae665c28f6d89104fb7b4fb7d78c76e73bbbe..152bfc4f10e153f472df9934d704711834a0e853 100644 |
| --- a/chrome/browser/resources/options/manage_profile_overlay.js |
| +++ b/chrome/browser/resources/options/manage_profile_overlay.js |
| @@ -371,6 +371,11 @@ cr.define('options', function() { |
| * @private |
| */ |
| receiveExistingSupervisedUsers_: function(supervisedUsers) { |
| + // During the creation of a SU, this gets called with a list including |
| + // the just-created SU. Ignore, to prevent the "already exists" bubble |
| + // from showing up if the overlay is already hidden. |
|
Marc Treib
2016/01/07 17:04:15
nit: Now the comment doesn't really correspond to
atanasova
2016/01/07 17:08:40
Done.
|
| + if (PageManager.getTopmostVisiblePage().pageDiv != this.pageDiv) |
| + return; |
| $('import-existing-supervised-user-link').hidden = |
| supervisedUsers.length === 0; |
| if (!$('create-profile-supervised').checked) |
| @@ -406,8 +411,10 @@ cr.define('options', function() { |
| HTMLEscape(elide(newName, /* maxLength */ 50))); |
| this.showErrorBubble_(errorHtml, 'create', true); |
| - $('supervised-user-import-existing').onclick = |
| - this.getImportHandler_(supervisedUsers[i], nameIsUnique); |
| + if ($('supervised-user-import-existing')) { |
| + $('supervised-user-import-existing').onclick = |
| + this.getImportHandler_(supervisedUsers[i], nameIsUnique); |
| + } |
| $('create-profile-ok').disabled = true; |
| return; |
| } |