Revert 291286: broke 'ExtensionOptionsApiTest.ExtensionCanEmbedOwnOptions'.

trunk/src/chrome/renderer/resources/extensions/extension_options.js

Index: trunk/src/chrome/renderer/resources/extensions/extension_options.js
===================================================================
--- trunk/src/chrome/renderer/resources/extensions/extension_options.js	(revision 291327)
+++ trunk/src/chrome/renderer/resources/extensions/extension_options.js	(working copy)
@@ -25,8 +25,6 @@
   this.extensionoptionsNode = extensionoptionsNode;
   this.viewInstanceId = IdGenerator.GetNextId();
 
-  this.autosizeDeferred = false;
-
   // on* Event handlers.
   this.eventHandlers = {};
 
@@ -140,18 +138,9 @@
   this.createGuest();
 };
 
-ExtensionOptionsInternal.prototype.onSizeChanged =
-    function(newWidth, newHeight, oldWidth, oldHeight) {
-  if (this.autosizeDeferred) {
-    this.deferredAutoSizeState = {
-      newWidth: newWidth,
-      newHeight: newHeight,
-      oldWidth: oldWidth,
-      oldHeight: oldHeight
-    };
-  } else {
-    this.resize(newWidth, newHeight, oldWidth, oldHeight);
-  }
+ExtensionOptionsInternal.prototype.onSizeChanged = function(width, height) {
+  this.browserPluginNode.style.width = width + 'px';
+  this.browserPluginNode.style.height = height + 'px';
 };
 
 ExtensionOptionsInternal.prototype.parseExtensionAttribute = function() {
@@ -162,32 +151,6 @@
   return false;
 };
 
-ExtensionOptionsInternal.prototype.resize =
-    function(newWidth, newHeight, oldWidth, oldHeight) {
-  this.browserPluginNode.style.width = newWidth + 'px';
-  this.browserPluginNode.style.height = newHeight + 'px';
-
-  // Do not allow the options page's dimensions to shrink so that the options
-  // page has a consistent UI. If the new size is larger than the minimum,
-  // make that the new minimum size.
-  if (newWidth > this.minwidth)
-    this.minwidth = newWidth;
-  if (newHeight > this.minheight)
-    this.minheight = newHeight;
-
-  GuestViewInternal.setAutoSize(this.instanceId, {
-    'enableAutoSize': this.extensionoptionsNode.hasAttribute('autosize'),
-    'min': {
-      'width': parseInt(this.minwidth || 0),
-      'height': parseInt(this.minheight || 0)
-    },
-    'max': {
-      'width': parseInt(this.maxwidth || 0),
-      'height': parseInt(this.maxheight || 0)
-    }
-  });
-};
-
 // Adds an 'on<event>' property on the view, which can be used to set/unset
 // an event handler.
 ExtensionOptionsInternal.prototype.setupEventProperty = function(eventName) {
@@ -253,36 +216,8 @@
     this.minwidth = AUTO_SIZE_ATTRIBUTES.minwidth;
     this.maxwidth = AUTO_SIZE_ATTRIBUTES.maxwidth;
   }
-};
+}
 
-/**
- * Toggles whether the element should automatically resize to its preferred
- * size. If set to true, when the element receives new autosize dimensions,
- * it passes them to the embedder in a sizechanged event, but does not resize
- * itself to those dimensions until the embedder calls resumeDeferredAutoSize.
- * This allows the embedder to defer the resizing until it is ready.
- * When set to false, the element resizes whenever it receives new autosize
- * dimensions.
- */
-ExtensionOptionsInternal.prototype.setDeferAutoSize = function(value) {
-  if (!value)
-    resumeDeferredAutoSize();
-  this.autosizeDeferred = value;
-};
-
-/**
- * Allows the element to resize to most recent set of autosize dimensions if
- * autosizing is being deferred.
- */
-ExtensionOptionsInternal.prototype.resumeDeferredAutoSize = function() {
-  if (this.autosizeDeferred) {
-    this.resize(this.deferredAutoSizeState.newWidth,
-                this.deferredAutoSizeState.newHeight,
-                this.deferredAutoSizeState.oldWidth,
-                this.deferredAutoSizeState.oldHeight);
-  }
-};
-
 function registerBrowserPluginElement() {
   var proto = Object.create(HTMLObjectElement.prototype);
 
@@ -320,22 +255,6 @@
     internal.handleExtensionOptionsAttributeMutation(name, oldValue, newValue);
   };
 
-  var methods = [
-    'setDeferAutoSize',
-    'resumeDeferredAutoSize'
-  ];
-
-  // Forward proto.foo* method calls to ExtensionOptionsInternal.foo*.
-  for (var i = 0; methods[i]; ++i) {
-    var createHandler = function(m) {
-      return function(var_args) {
-        var internal = privates(this).internal;
-        return $Function.apply(internal[m], internal, arguments);
-      };
-    };
-    proto[methods[i]] = createHandler(methods[i]);
-  }
-
   window.ExtensionOptions =
       DocumentNatives.RegisterElement('extensionoptions', {prototype: proto});