Chromium Code Reviews| Index: chrome/browser/resources/extensions/extension_list.js |
| =================================================================== |
| --- chrome/browser/resources/extensions/extension_list.js (revision 139285) |
| +++ 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.mayModifySettings) |
| 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.mayModifySettings; |
|
Evan Stade
2012/05/30 21:20:01
.may-not-disable .optional-controls {
display: n
|
| + |
| 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.mayModifySettings; |
| - if (extension.mayDisable) { |
| + if (extension.mayModifySettings) { |
| 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.mayModifySettings) |
| node.querySelector('.managed-message').hidden = false; |
| // Then active views. |
| @@ -256,7 +259,7 @@ |
| } |
| this.appendChild(node); |
| - }, |
| + } |
| }; |
| return { |