Update chrome://extensions for supervised users

chrome/browser/resources/extensions/extension_list.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.
 
 <include src="extension_error.js">
 
 ///////////////////////////////////////////////////////////////////////////////
 // ExtensionFocusRow:
 
 /**
@@ skipping 613 matching lines @@
         // becomes enabled/disabled. It also might not become enabled or
         // disabled, because the user might e.g. get prompted when enabling
         // and choose not to.
         e.preventDefault();
       });
 
       // 'Remove' button.
       var trashTemplate = $('template-collection').querySelector('.trash');
       var trash = trashTemplate.cloneNode(true);
       trash.title = loadTimeData.getString('extensionUninstall');
-      trash.hidden = !extension.userMayModify;

[Marc Treib, 2015/05/19 13:21:51]

Handled by css, no need to do it again here.

       trash.setAttribute('column-type', 'trash');
       trash.addEventListener('click', function(e) {
         trash.classList.add('open');
         trash.classList.toggle('mouse-clicked', e.detail > 0);
         if (this.uninstallIsShowing_)
           return;
         this.uninstallIsShowing_ = true;
         chrome.management.uninstall(extension.id,
                                     {showConfirmDialog: true},
                                     function() {
@@ skipping 42 matching lines @@
      * @private
      */
     updateNode_: function(extension, row) {
       var isActive =
           extension.state == chrome.developerPrivate.ExtensionState.ENABLED;
       row.classList.toggle('inactive-extension', !isActive);
 
       // Hack to keep the closure compiler happy about |remove|.
       // TODO(hcarmona): Remove this hack when the closure compiler is updated.
       var node = /** @type {Element} */ (row);
-      node.classList.remove('policy-controlled', 'may-not-modify',
-                            'may-not-remove');
+      node.classList.remove('controlled', 'may-not-remove');
       var classes = [];
-      if (!extension.userMayModify) {
-        classes.push('policy-controlled', 'may-not-modify');
-      } else if (extension.dependentExtensions.length > 0) {
-        classes.push('may-not-remove', 'may-not-modify');
-      } else if (extension.mustRemainInstalled) {
+      if (extension.controlledBy) {
+        classes.push('controlled');
+      } else if (!extension.userMayModify ||
+                 extension.mustRemainInstalled ||
+                 extension.dependentExtensions.length > 0) {
         classes.push('may-not-remove');
-      } else if (extension.disableReasons.suspiciousInstall ||
-                 extension.disableReasons.corruptInstall ||
-                 extension.disableReasons.updateRequired) {
-        classes.push('may-not-modify');

[Marc Treib, 2015/05/19 13:21:51]

The may-not-modify class doesn't actually do anything, so there's no need to set
it.

       }
       row.classList.add.apply(row.classList, classes);
 
       var item = row.querySelector('.extension-list-item');
       item.style.backgroundImage = 'url(' + extension.iconUrl + ')';
 
       this.setText_(row, '.extension-title', extension.name);
       this.setText_(row, '.extension-version', extension.version);
       this.setText_(row, '.location-text', extension.locationText || '');
       this.setText_(row, '.blacklist-text', extension.blacklistText || '');
@@ skipping 115 matching lines @@
       this.updateVisibility_(row, '.corrupted-repair-button', canRepair);
 
       // The 'Enabled' checkbox.
       var isOK = !isTerminated && !canRepair;
       this.updateVisibility_(row, '.enable-checkbox', isOK, function(item) {
         var enableCheckboxDisabled =
             !extension.userMayModify ||
             extension.disableReasons.suspiciousInstall ||
             extension.disableReasons.corruptInstall ||
             extension.disableReasons.updateRequired ||
-            extension.installedByCustodian ||
             extension.dependentExtensions.length > 0;
         item.querySelector('input').disabled = enableCheckboxDisabled;
         item.querySelector('input').checked = isActive;
       });
 
-      // Button for extensions controlled by policy.
+      // Indicator for extensions controlled by policy.
       var controlNode = row.querySelector('.enable-controls');
       var indicator =
           controlNode.querySelector('.controlled-extension-indicator');
-      var needsIndicator = isOK &&
-                           !extension.userMayModify &&
-                           extension.policyText;
-      // TODO(treib): If userMayModify is false, but policyText is empty, that
-      // indicates this extension is controlled by something else than
-      // enterprise policy (such as the profile being supervised). For now, just
-      // don't show the indicator in this case. We should really handle this
-      // better though (ie use a different text and icon).
+      var needsIndicator = isOK && extension.controlledBy;
 
       if (needsIndicator && !indicator) {
         indicator = new cr.ui.ControlledIndicator();
         indicator.classList.add('controlled-extension-indicator');
-        indicator.setAttribute('controlled-by', 'policy');
-        var textPolicy = extension.policyText || '';
-        indicator.setAttribute('textpolicy', textPolicy);
-        indicator.image.setAttribute('aria-label', textPolicy);
+        indicator.setAttribute('controlled-by', extension.controlledBy);
+        var text = extension.controlledByText || '';
+        indicator.setAttribute('text' + extension.controlledBy, text);
+        indicator.image.setAttribute('aria-label', text);
         controlNode.appendChild(indicator);
         indicator.querySelector('div').setAttribute('column-type',
                                                     'enterprise');
       } else if (!needsIndicator && indicator) {
         controlNode.removeChild(indicator);
       }
 
       // Developer mode ////////////////////////////////////////////////////////
 
       // First we have the id.
@@ skipping 281 matching lines @@
         this.createNode_(extension, nextExt ? $(nextExt.id) : null);
       }
     }
   };
 
   return {
     ExtensionList: ExtensionList,
     ExtensionListDelegate: ExtensionListDelegate
   };
 });