Handle closing web contents in ExtensionOptionsGuest

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 29 matching lines @@
       this.showOverlay_ = showOverlay;
     },
 
     /**
      * Handles a click on the close button.
      * @param {Event} e The click event.
      * @private
      */
     handleDismiss_: function(event) {
       this.setVisible_(false);
-      var extensionoptions = document.querySelector('extensionoptions');
+      var extensionoptions =
+          $('extension-options-overlay-guest')
+              .querySelector('extensionoptions');
+
       if (extensionoptions)
-        $('extension-options-overlay').removeChild(extensionoptions);
+        $('extension-options-overlay-guest').removeChild(extensionoptions);
     },
 
     /**
      * 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.
      */
     setExtensionAndShowOverlay: function(extensionId, extensionName) {
       var extensionoptions = new ExtensionOptions();
       extensionoptions.extension = extensionId;
       extensionoptions.autosize = 'on';
 
+      extensionoptions.onclose = function() {
+        this.handleDismiss_();
+      }.bind(this);
+
       // TODO(ericzeng): Resize in a non-jarring way.
       extensionoptions.onsizechanged = function(evt) {
         $('extension-options-overlay').style.width = evt.width;
         $('extension-options-overlay').style.height = evt.height;
       }.bind(this);
 
-      $('extension-options-overlay').appendChild(extensionoptions);
+      $('extension-options-overlay-guest').appendChild(extensionoptions);
 
       $('extension-options-overlay-title').textContent = extensionName;
 
       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
   };
 });