Embedded Extension Options: Improve the overlay popup UI

chrome/browser/resources/extensions/extension_options_overlay.js

 // Copyright 2014 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.
 
 cr.define('extensions', function() {
   'use strict';
 
   /**
    * The ExtensionOptionsOverlay will show an extension's options page using
    * an <extensionoptions> element.
@@ skipping 35 matching lines @@
      * @private
      */
     handleDismiss_: function(event) {
       this.setVisible_(false);
       var extensionoptions =
           $('extension-options-overlay-guest')
               .querySelector('extensionoptions');
 
       if (extensionoptions)
         $('extension-options-overlay-guest').removeChild(extensionoptions);
+
+      $('extension-options-overlay-icon').removeAttribute('src');
     },
 
     /**
      * Associate an extension with the overlay and display it.
      * @param {string} extensionId The id of the extension whose options page
      *     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;
+
+      this.setVisible_(true);
 
       var extensionoptions = new ExtensionOptions();
       extensionoptions.extension = extensionId;
       extensionoptions.autosize = 'on';
 
       // The <extensionoptions> content's size needs to be restricted to the
       // bounds of the overlay window. The overlay gives a min width and
       // 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;
 
       extensionoptions.minwidth =
           parseInt(window.getComputedStyle($('extension-options-overlay'))
               .minWidth);
 
       extensionoptions.setDeferAutoSize(true);
 
@@ skipping 36 matching lines @@
       // Don't allow the <extensionoptions> to autosize until the overlay
       // animation is complete.
       extensionoptions.setDeferAutoSize(true);
 
       // Move the <extensionoptions> off screen until the overlay is ready
       $('extension-options-overlay-guest').style.position = 'fixed';
       $('extension-options-overlay-guest').style.left =
           window.outerWidth + 'px';
 
       $('extension-options-overlay-guest').appendChild(extensionoptions);
-      this.setVisible_(true);
     },
 
     /**
      * Toggles the visibility of the ExtensionOptionsOverlay.
      * @param {boolean} isVisible Whether the overlay should be visible.
      * @private
      */
     setVisible_: function(isVisible) {
       this.showOverlay_(isVisible ? $('extension-options-overlay') : null);
     }
   };
 
   // Export
   return {
     ExtensionOptionsOverlay: ExtensionOptionsOverlay
   };
 });