Add remove non-device-owner user removal confirmation

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 1509 matching lines @@
       if (this.disabled)
         return;
       this.actionBoxMenuTitleElement.tabIndex = -1;
     },
 
     /**
      * Handles a click event on remove user command.
      * @param {Event} e Click event.
      */
     handleRemoveCommandClick_: function(e) {
-      if (this.user.legacySupervisedUser || this.user.isDesktopUser) {
-        this.showRemoveWarning_();
-        return;
-      }
-      if (this.isActionBoxMenuActive)
-        chrome.send('removeUser', [this.user.username]);
+      this.showRemoveWarning_();
     },
 
     /**
      * Move the action box menu up if needed.
      */
     moveActionMenuUpIfNeeded_: function() {
       // Skip checking (computationally expensive) if already moved up.
       if (this.actionBoxMenu.classList.contains('menu-moved-up'))
         return;
 
       // Move up the menu if it overlaps shelf.
       var maxHeight = cr.ui.LoginUITools.getMaxHeightBeforeShelfOverlapping(
           this.actionBoxMenu, true);
       var actualHeight = parseInt(
           window.getComputedStyle(this.actionBoxMenu).height);
       if (maxHeight < actualHeight) {
         this.actionBoxMenu.classList.add('menu-moved-up');
         this.actionBoxAreaElement.classList.add('menu-moved-up');
       }
     },
 
     /**
-     * Shows remove user warning. Used for legacy supervised users on CrOS, and
-     * for all users on desktop.
+     * Shows remove user warning. Used for legacy supervised users
+     * 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.isLegacySupervisedUser) {
+      if (!this.user.isDesktopUser) {
         this.moveActionMenuUpIfNeeded_();
       } 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 156 matching lines @@
 
     /**
      * Handles a keydown event on remove command.
      * @param {Event} e KeyDown event.
      */
     handleRemoveCommandKeyDown_: function(e) {
       if (this.disabled)
         return;
       switch (e.key) {
         case 'Enter':
-          if (this.user.legacySupervisedUser || this.user.isDesktopUser) {
-            // Prevent default so that we don't trigger a 'click' event on the
-            // remove button that will be focused.
-            e.preventDefault();
-            this.showRemoveWarning_();
-          } else {
-            this.removeUser(this.user);
-          }
+          e.preventDefault();
+          this.showRemoveWarning_();
           e.stopPropagation();
           break;
         case 'ArrowUp':
         case 'ArrowDown':
           e.stopPropagation();
           break;
         // Ignore these two, so ChromeVox hotkeys don't close the menu before
         // they can navigate through it.
         case 'Shift':
         case 'Meta':
@@ skipping 1749 matching lines @@
        if (pod && pod.multiProfilesPolicyApplied) {
          pod.userTypeBubbleElement.classList.remove('bubble-shown');
        }
      }
   };
 
   return {
     PodRow: PodRow
   };
 });