Update remove non-owner user warning message and fix the unwanted space

ui/login/account_picker/user_pod_row.js

 // Copyright 2014 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.
 
 /**
  * @fileoverview User pod row implementation.
  */
 
 cr.define('login', function() {
   /**
@@ skipping 1519 matching lines @@
      * and non-device-owner on CrOS, and for all users on desktop.
      */
     showRemoveWarning_: function() {
       this.actionBoxMenuRemoveElement.hidden = true;
       this.actionBoxRemoveUserWarningElement.hidden = false;
 
       // Show extra statistics information for desktop users
       var message;
       if (!this.user.isDesktopUser) {
         this.moveActionMenuUpIfNeeded_();
+        if (!this.user.legacySupervisedUser) {
+          this.querySelector(
+              '.action-box-remove-user-warning-text').style.display = 'none';
+          this.querySelector(
+              '.action-box-remove-user-warning-table-nonsync').style.display
+              = 'none';
+          var message = loadTimeData.getString('removeNonOwnerUserWarningText');
+          var element_id = '.action-box-remove-non-owner-user-warning-text';
+          this.updateRemoveWarningDialogSetMessage_(element_id,
+                                                    this.user.profilePath,
+                                                    message);
+        }
       } else {
         this.querySelector(
           '.action-box-remove-non-owner-user-warning-text').hidden = true;
         this.RemoveWarningDialogSetMessage_(true, false);
         // set a global handler for the callback
         window.updateRemoveWarningDialog =
             this.updateRemoveWarningDialog_.bind(this);
         chrome.send('removeUserWarningLoadStats', [this.user.profilePath]);
       }
       chrome.send('logRemoveUserWarningShown');
@@ skipping 43 matching lines @@
           stats_elements[key].textContent = count;
           total_count += count;
           num_stats_loaded++;
         }
       }
 
       // this.classList is used for selecting the appropriate dialog.
       if (total_count)
         this.classList.remove('has-no-stats');
 
+      var elementSelector = '.action-box-remove-user-warning-text';
       var is_synced_user = this.user.emailAddress !== "";
       // Write total number if all statistics are loaded.
       if (num_stats_loaded === Object.keys(stats_elements).length) {
         if (!total_count) {
           this.classList.add('has-no-stats');
           var message = loadTimeData.getString(
               is_synced_user ? 'removeUserWarningTextSyncNoStats' :
                                'removeUserWarningTextNonSyncNoStats');
-          this.updateRemoveWarningDialogSetMessage_(this.user.profilePath,
+          this.updateRemoveWarningDialogSetMessage_(elementSelector,
+                                                    this.user.profilePath,
                                                     message);
         } else {
           window.updateRemoveWarningDialogSetMessage =
               this.updateRemoveWarningDialogSetMessage_.bind(this);
           chrome.send('getRemoveWarningDialogMessage',[{
               profilePath: this.user.profilePath,
               isSyncedUser: is_synced_user,
               hasErrors: hasErrors,
               totalCount: total_count
           }]);
         }
       } else if (isInitial) {
         if (!this.user.isProfileLoaded) {
           message = loadTimeData.getString(
               is_synced_user ? 'removeUserWarningTextSyncNoStats' :
                                'removeUserWarningTextNonSyncNoStats');
-          this.updateRemoveWarningDialogSetMessage_(this.user.profilePath,
+          this.updateRemoveWarningDialogSetMessage_(elementSelector,
+                                                    this.user.profilePath,
                                                     message);
         } else {
           message = loadTimeData.getString(
               is_synced_user ? 'removeUserWarningTextSyncCalculating' :
                                'removeUserWarningTextNonSyncCalculating');
           substitute = loadTimeData.getString(
               'removeUserWarningTextCalculating');
-          this.updateRemoveWarningDialogSetMessage_(this.user.profilePath,
+          this.updateRemoveWarningDialogSetMessage_(elementSelector,
+                                                    this.user.profilePath,
                                                     message, substitute);
         }
       }
     },
 
     /**
      * Refresh the message in the remove user warning dialog.
+     * @param {string} elementSelector The elementSelector of warning dialog.
      * @param {string} profilePath The filepath of the URL (must be verified).
      * @param {string} message The message to be written.
      * @param {number|string=} count The number or string to replace $1 in
      * |message|. Can be omitted if $1 is not present in |message|.
      */
-    updateRemoveWarningDialogSetMessage_: function(profilePath, message,
+    updateRemoveWarningDialogSetMessage_: function(elementSelector,
+                                                   profilePath,
+                                                   message,
                                                    count) {
       if (profilePath !== this.user.profilePath)
         return;
       // Add localized messages where $1 will be replaced with
       // <span class="total-count"></span> and $2 will be replaced with
       // <span class="email"></span>.
-      var element = this.querySelector('.action-box-remove-user-warning-text');
+      var element = this.querySelector(elementSelector);
       element.textContent = '';
 
       messageParts = message.split(/(\$[12])/);
       var numParts = messageParts.length;
       for (var j = 0; j < numParts; j++) {
         if (messageParts[j] === '$1') {
           var elementToAdd = document.createElement('span');
           elementToAdd.classList.add('total-count');
           elementToAdd.textContent = count;
           element.appendChild(elementToAdd);
@@ skipping 1856 matching lines @@
        if (pod && pod.multiProfilesPolicyApplied) {
          pod.userTypeBubbleElement.classList.remove('bubble-shown');
        }
      }
   };
 
   return {
     PodRow: PodRow
   };
 });