| Index: chrome/browser/resources/extensions/extension_list.js
|
| ===================================================================
|
| --- chrome/browser/resources/extensions/extension_list.js (revision 136836)
|
| +++ chrome/browser/resources/extensions/extension_list.js (working copy)
|
| @@ -48,8 +48,7 @@
|
| */
|
| showExtensionNodes_: function() {
|
| // Iterate over the extension data and add each item to the list.
|
| - var list = this;
|
| - this.data_.extensions.forEach(this.createNode_.bind(this));
|
| + this.data_.extensions.forEach(this.createNode_, this);
|
|
|
| if (this.data_.extensions.length == 0)
|
| this.classList.add('empty-extension-list');
|
| @@ -72,7 +71,7 @@
|
| if (!extension.enabled || extension.terminated)
|
| node.classList.add('inactive-extension');
|
|
|
| - if (!extension.mayDisable)
|
| + if (!extension.mayModifyStatus)
|
| node.classList.add('may-not-disable');
|
|
|
| var item = node.querySelector('.extension-list-item');
|
| @@ -156,13 +155,17 @@
|
| reload.hidden = false;
|
| }
|
|
|
| + // Disable optional controls if they cannot be used.
|
| + node.querySelector('.optional-controls').hidden =
|
| + !extension.mayModifyUsage;
|
| +
|
| if (!extension.terminated) {
|
| // The 'Enabled' checkbox.
|
| var enable = node.querySelector('.enable-checkbox');
|
| enable.hidden = false;
|
| - enable.querySelector('input').disabled = !extension.mayDisable;
|
| + enable.querySelector('input').disabled = !extension.mayModifyStatus;
|
|
|
| - if (extension.mayDisable) {
|
| + if (extension.mayModifyStatus) {
|
| enable.addEventListener('click', function(e) {
|
| chrome.send('extensionSettingsEnable',
|
| [extension.id, e.target.checked ? 'true' : 'false']);
|
| @@ -202,7 +205,7 @@
|
| }
|
|
|
| // Then the 'managed, cannot uninstall/disable' message.
|
| - if (!extension.mayDisable)
|
| + if (!extension.mayModifyStatus)
|
| node.querySelector('.managed-message').hidden = false;
|
|
|
| // Then active views.
|
|
|