Allow supervised users to delete profiles in about:settings.

chrome/browser/resources/options/manage_profile_overlay.js

 // Copyright (c) 2012 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 Page = cr.ui.pageManager.Page;
   var PageManager = cr.ui.pageManager.PageManager;
   var ArrayDataModel = cr.ui.ArrayDataModel;
 
   /**
@@ skipping 53 matching lines @@
         CreateProfileOverlay.cancelCreateProfile();
       };
 
       $('manage-profile-cancel').onclick =
           $('disconnect-managed-profile-cancel').onclick =
           $('delete-profile-cancel').onclick = function(event) {
         PageManager.closeOverlay();
       };
       $('delete-profile-ok').onclick = function(event) {
         PageManager.closeOverlay();
-        if (BrowserOptions.getCurrentProfile().isSupervised)
-          return;
         chrome.send('deleteProfile', [self.profileInfo_.filePath]);
         options.SupervisedUserListData.resetPromise();
       };
       $('add-shortcut-button').onclick = function(event) {
         chrome.send('addProfileShortcut', [self.profileInfo_.filePath]);
       };
       $('remove-shortcut-button').onclick = function(event) {
         chrome.send('removeProfileShortcut', [self.profileInfo_.filePath]);
       };
 
@@ skipping 55 matching lines @@
       // call |receiveHasProfileShortcuts|, which will show the appropriate one.
       $('remove-shortcut-button').hidden = true;
       $('add-shortcut-button').hidden = true;
 
       if (loadTimeData.getBoolean('profileShortcutsEnabled')) {
         var profileInfo = ManageProfileOverlay.getInstance().profileInfo_;
         chrome.send('requestHasProfileShortcuts', [profileInfo.filePath]);
       }
 
       var manageNameField = $('manage-profile-name');
-      // Supervised users cannot edit their names.
+      // Legacy supervised users cannot edit their names.
       if (manageNameField.disabled)
         $('manage-profile-ok').focus();
       else
         manageNameField.focus();
 
       this.profileNameIsDefault_ = false;
     },
 
     /**
      * Registers event handlers that are common between create and manage modes.
@@ skipping 367 matching lines @@
      * @private
      */
     prepareForManageDialog_: function() {
       chrome.send('refreshGaiaPicture');
       var profileInfo = BrowserOptions.getCurrentProfile();
       ManageProfileOverlay.setProfileInfo(profileInfo, 'manage');
       $('manage-profile-overlay-create').hidden = true;
       $('manage-profile-overlay-manage').hidden = false;
       $('manage-profile-overlay-delete').hidden = true;
       $('manage-profile-overlay-disconnect-managed').hidden = true;
-      $('manage-profile-name').disabled = profileInfo.isSupervised;
+      $('manage-profile-name').disabled =
+          profileInfo.isSupervised && !profileInfo.isChild;
       this.hideErrorBubble_('manage');
     },
 
     /**
      * Display the "Manage Profile" dialog.
      * @param {boolean=} opt_updateHistory If we should update the history after
      *     showing the dialog (defaults to true).
      * @private
      */
     showManageDialog_: function(opt_updateHistory) {
       var updateHistory = opt_updateHistory !== false;
       this.prepareForManageDialog_();
       PageManager.showPageByName('manageProfile', updateHistory);
     },
 
     /**
      * Display the "Delete Profile" dialog.
      * @param {Object} profileInfo The profile object of the profile to delete.
      * @private
      */
     showDeleteDialog_: function(profileInfo) {
-      if (BrowserOptions.getCurrentProfile().isSupervised)
-        return;
-
       ManageProfileOverlay.setProfileInfo(profileInfo, 'manage');
       $('manage-profile-overlay-create').hidden = true;
       $('manage-profile-overlay-manage').hidden = true;
       $('manage-profile-overlay-delete').hidden = false;
       $('manage-profile-overlay-disconnect-managed').hidden = true;
       $('delete-profile-icon').style.content =
           getProfileAvatarIcon(profileInfo.iconURL);
       $('delete-profile-text').textContent =
           loadTimeData.getStringF('deleteProfileMessage',
                                   elide(profileInfo.name, /* maxLength */ 50));
       $('delete-supervised-profile-addendum').hidden =
-          !profileInfo.isSupervised;
+          !(profileInfo.isSupervised && !profileInfo.isChild);

[Bernhard Bauer, 2015/02/09 12:13:48]

Normalize this to `!profileInfo.isSupervised || profileInfo.isChild`?

[Marc Treib, 2015/02/09 12:20:26]

Yeah, I was wondering which way would be easier to read... I kinda read my way
as "hidden = !(legacySU)". Too many negations here... oh well. Done.

 
       // Because this dialog isn't useful when refreshing or as part of the
       // history, don't create a history entry for it when showing.
       PageManager.showPageByName('manageProfile', false);
     },
 
     /**
      * Display the "Disconnect Managed Profile" dialog.
      * @private
      */
@@ skipping 292 matching lines @@
     'updateSignedInStatus',
     'updateSupervisedUsersAllowed',
   ]);
 
   // Export
   return {
     ManageProfileOverlay: ManageProfileOverlay,
     CreateProfileOverlay: CreateProfileOverlay,
   };
 });