Update chrome://extensions for supervised users

chrome/browser/resources/extensions/extension_list.js

Index: chrome/browser/resources/extensions/extension_list.js
diff --git a/chrome/browser/resources/extensions/extension_list.js b/chrome/browser/resources/extensions/extension_list.js
index cbac155401277d806f165d977c049bed80ea769c..35801c948b945170a3ce215cd7be4d009cadf62a 100644
--- a/chrome/browser/resources/extensions/extension_list.js
+++ b/chrome/browser/resources/extensions/extension_list.js
@@ -631,7 +631,6 @@ cr.define('extensions', function() {
       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');
@@ -694,19 +693,14 @@ cr.define('extensions', function() {
       // 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);
 
@@ -842,32 +836,24 @@ cr.define('extensions', function() {
             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');