Fix ExtensionOptionsGuest style and minor bug

- Reorganize methods in cc file so they match up with the header
- In SetUpAutoSize, use the autosize flag parameter read in from
  the embedder to enable/disable autosize instead of passing true

BUG=386838

Review URL: https://codereview.chromium.org/510183002

Cr-Commit-Position: refs/heads/master@{#292629}

chrome/browser/guest_view/extension_options/extension_options_guest.cc

@@ -135,25 +135,6 @@ int ExtensionOptionsGuest::GetTaskPrefix() const {
   return IDS_EXTENSION_TASK_MANAGER_EXTENSIONOPTIONS_TAG_PREFIX;
 }
 
-content::WebContents* ExtensionOptionsGuest::GetAssociatedWebContents() const {
-  return guest_web_contents();
-}
-
-bool ExtensionOptionsGuest::OnMessageReceived(const IPC::Message& message) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(ExtensionOptionsGuest, message)
-    IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-  return handled;
-}
-
-void ExtensionOptionsGuest::OnRequest(
-    const ExtensionHostMsg_Request_Params& params) {
-  extension_function_dispatcher_->Dispatch(
-      params, guest_web_contents()->GetRenderViewHost());
-}
-
 void ExtensionOptionsGuest::GuestSizeChangedDueToAutoSize(
     const gfx::Size& old_size,
     const gfx::Size& new_size) {
@@ -170,28 +151,8 @@ bool ExtensionOptionsGuest::IsAutoSizeSupported() const {
   return true;
 }
 
-void ExtensionOptionsGuest::SetUpAutoSize() {
-  // Read the autosize parameters passed in from the embedder.
-  bool auto_size_enabled = false;
-  attach_params()->GetBoolean(extensionoptions::kAttributeAutoSize,
-                             &auto_size_enabled);
-
-  int max_height = 0;
-  int max_width = 0;
-  attach_params()->GetInteger(extensionoptions::kAttributeMaxHeight,
-                              &max_height);
-  attach_params()->GetInteger(extensionoptions::kAttributeMaxWidth, &max_width);
-
-  int min_height = 0;
-  int min_width = 0;
-  attach_params()->GetInteger(extensionoptions::kAttributeMinHeight,
-                              &min_height);
-  attach_params()->GetInteger(extensionoptions::kAttributeMinWidth, &min_width);
-
-  // Call SetAutoSize to apply all the appropriate validation and clipping of
-  // values.
-  SetAutoSize(
-      true, gfx::Size(min_width, min_height), gfx::Size(max_width, max_height));
+content::WebContents* ExtensionOptionsGuest::GetAssociatedWebContents() const {
+  return guest_web_contents();
 }
 
 void ExtensionOptionsGuest::CloseContents(content::WebContents* source) {
@@ -237,3 +198,43 @@ bool ExtensionOptionsGuest::ShouldCreateWebContents(
   //   ctrl-click or middle mouse button click
   return false;
 }
+
+bool ExtensionOptionsGuest::OnMessageReceived(const IPC::Message& message) {
+  bool handled = true;
+  IPC_BEGIN_MESSAGE_MAP(ExtensionOptionsGuest, message)
+    IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+  return handled;
+}
+
+void ExtensionOptionsGuest::OnRequest(
+    const ExtensionHostMsg_Request_Params& params) {
+  extension_function_dispatcher_->Dispatch(
+      params, guest_web_contents()->GetRenderViewHost());
+}
+
+void ExtensionOptionsGuest::SetUpAutoSize() {
+  // Read the autosize parameters passed in from the embedder.
+  bool auto_size_enabled = false;
+  attach_params()->GetBoolean(extensionoptions::kAttributeAutoSize,
+                              &auto_size_enabled);
+
+  int max_height = 0;
+  int max_width = 0;
+  attach_params()->GetInteger(extensionoptions::kAttributeMaxHeight,
+                              &max_height);
+  attach_params()->GetInteger(extensionoptions::kAttributeMaxWidth, &max_width);
+
+  int min_height = 0;
+  int min_width = 0;
+  attach_params()->GetInteger(extensionoptions::kAttributeMinHeight,
+                              &min_height);
+  attach_params()->GetInteger(extensionoptions::kAttributeMinWidth, &min_width);
+
+  // Call SetAutoSize to apply all the appropriate validation and clipping of
+  // values.
+  SetAutoSize(auto_size_enabled,
+              gfx::Size(min_width, min_height),
+              gfx::Size(max_width, max_height));
+}

chrome/browser/guest_view/extension_options/extension_options_guest.h

@@ -61,8 +61,8 @@ class ExtensionOptionsGuest
   ExtensionOptionsGuest(content::BrowserContext* browser_context,
                         int guest_instance_id);
   virtual ~ExtensionOptionsGuest();
-  void SetUpAutoSize();
   void OnRequest(const ExtensionHostMsg_Request_Params& params);
+  void SetUpAutoSize();
 
   scoped_ptr<extensions::ExtensionFunctionDispatcher>
       extension_function_dispatcher_;

chrome/renderer/resources/extensions/extension_options.js

@@ -53,7 +53,7 @@ ExtensionOptionsInternal.prototype.attachWindow = function() {
       this.internalInstanceId,
       this.guestInstanceId,
       {
-        'autosize': this.autosize,
+        'autosize': this.extensionoptionsNode.hasAttribute('autosize'),
         'instanceId': this.viewInstanceId,
         'maxheight': parseInt(this.maxheight || 0),
         'maxwidth': parseInt(this.maxwidth || 0),