Chromium Code Reviews| Index: chrome/browser/resources/extensions/extension_options_overlay.js |
| diff --git a/chrome/browser/resources/extensions/extension_options_overlay.js b/chrome/browser/resources/extensions/extension_options_overlay.js |
| index 9af2c20da2aff4a4560ddb86d878c4be3aee0bd0..a9b3cfde592f05085e592c62e5fcd64cdb1dbfd4 100644 |
| --- a/chrome/browser/resources/extensions/extension_options_overlay.js |
| +++ b/chrome/browser/resources/extensions/extension_options_overlay.js |
| @@ -50,6 +50,8 @@ cr.define('extensions', function() { |
| var extensionoptions = document.querySelector('extensionoptions'); |
| if (extensionoptions) |
| $('extension-options-overlay-guest').removeChild(extensionoptions); |
| + |
| + $('extension-options-overlay-icon').removeAttribute('src'); |
| }, |
| /** |
| @@ -58,9 +60,15 @@ cr.define('extensions', function() { |
| * should be displayed in the overlay. |
| * @param {string} extensionName The name of the extension, which is used |
| * as the header of the overlay. |
| + * @param {string} extensionIcon The URL of the extension's icon. |
| */ |
| - setExtensionAndShowOverlay: function(extensionId, extensionName) { |
| + setExtensionAndShowOverlay: function(extensionId, |
| + extensionName, |
| + extensionIcon) { |
| $('extension-options-overlay-title').textContent = extensionName; |
| + $('extension-options-overlay-icon').src = extensionIcon; |
|
not at google - send to devlin
2014/08/23 00:24:16
Should this be .setAttribute('src')? Even if .src
|
| + |
| + this.setVisible_(true); |
| var extensionoptions = new ExtensionOptions(); |
| extensionoptions.extension = extensionId; |
| @@ -71,7 +79,7 @@ cr.define('extensions', function() { |
| // max height, but the maxheight does not include our header height |
| // (title and close button), so we need to subtract that to get the |
| // max height for the extension options. |
| - var headerHeight = $('extension-options-overlay-title').offsetHeight; |
| + var headerHeight = $('extension-options-overlay-header').offsetHeight; |
| var overlayMaxHeight = |
| parseInt($('extension-options-overlay').style.maxHeight); |
| extensionoptions.maxheight = overlayMaxHeight - headerHeight; |
| @@ -122,7 +130,6 @@ cr.define('extensions', function() { |
| window.outerWidth + 'px'; |
| $('extension-options-overlay-guest').appendChild(extensionoptions); |
| - this.setVisible_(true); |
| }, |
| /** |