Replace own callback handling with Promises.

chrome/browser/resources/options/managed_user_import.js

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('options', function() {
   var OptionsPage = options.OptionsPage;
   var ArrayDataModel = cr.ui.ArrayDataModel;
 
   /**
    * ManagedUserImportOverlay class.
@@ skipping 32 matching lines @@
       options.ProfilesIconGrid.decorate(avatarGrid);
       var avatarIcons = loadTimeData.getValue('avatarIcons');
       avatarGrid.dataModel = new ArrayDataModel(avatarIcons);
 
       managedUserList.addEventListener('change', function(event) {
         var managedUser = managedUserList.selectedItem;
         if (!managedUser)
           return;
 
         $('managed-user-import-ok').disabled =
-            managedUserList.selectedItem.onCurrentDevice;
+            managedUserList.selectedItem.onCurrentDevice ||
+            managedUserList.selectedItem.nameConflict;
       });
 
       var self = this;
       $('managed-user-import-cancel').onclick = function(event) {
         OptionsPage.closeOverlay();
         self.updateImportInProgress_(false);
 
         // 'cancelCreateProfile' is handled by CreateProfileHandler.
         chrome.send('cancelCreateProfile');
       };
 
       $('managed-user-import-ok').onclick =
           this.showAvatarGridOrSubmit_.bind(this);
 
       $('create-new-user-link').onclick = function(event) {
         OptionsPage.closeOverlay();
         OptionsPage.navigateToPage('createProfile');
       };
     },
 
     /**
      * @override
      */
     didShowPage: function() {
-      options.ManagedUserListData.requestExistingManagedUsers(
+      options.ManagedUserListData.requestExistingManagedUsers().then(
           this.receiveExistingManagedUsers_, this.onSigninError_.bind(this));
 
       this.updateImportInProgress_(false);
       $('managed-user-import-error-bubble').hidden = true;
       $('managed-user-import-ok').disabled = true;
       $('select-avatar-grid').hidden = true;
       $('managed-user-list').hidden = false;
 
       $('managed-user-import-ok').textContent =
           loadTimeData.getString('managedUserImportOk');
@@ skipping 71 matching lines @@
 
     /**
      * Sets the data model of the managed user list to |managedUsers|.
      * @param {Array.<Object>} managedUsers An array of managed user objects.
      *     Each object is of the form:
      *       managedUser = {
      *         id: "Managed User ID",
      *         name: "Managed User Name",
      *         iconURL: "chrome://path/to/icon/image",
      *         onCurrentDevice: true or false,
+     *         nameConflict: true or false,
      *         needAvatar: true or false
      *       }
      * @private
      */
     receiveExistingManagedUsers_: function(managedUsers) {
       managedUsers.sort(function(a, b) {
+        if (a.onCurrentDevice != b.onCurrentDevice)
+          return a.onCurrentDevice ? 1 : -1;
+        if (a.nameConflict != b.nameConflict)
+          return a.nameConflict ? 1 : -1;
         return a.name.localeCompare(b.name);
       });
 
       $('managed-user-list').dataModel = new ArrayDataModel(managedUsers);
       if (managedUsers.length == 0) {
         this.onError_(loadTimeData.getString('noExistingManagedUsers'));
         $('managed-user-import-ok').disabled = true;
       } else {
         // Hide the error bubble.
         $('managed-user-import-error-bubble').hidden = true;
@@ skipping 37 matching lines @@
       var instance = ManagedUserImportOverlay.getInstance();
       return instance[name + '_'].apply(instance, arguments);
     };
   });
 
   // Export
   return {
     ManagedUserImportOverlay: ManagedUserImportOverlay,
   };
 });