[Constrained Web Dialogs] [Cocoa] Enable autoresizing immediately if intended.

chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
@@ skipping 131 matching lines @@
   void RenderViewCreated(content::RenderViewHost* render_view_host) override {
     if (IsDialogAutoResizable())
       EnableAutoResize();
   }
   void RenderViewHostChanged(content::RenderViewHost* old_host,
                              content::RenderViewHost* new_host) override {
     if (IsDialogAutoResizable())
       EnableAutoResize();
   }
   void DocumentOnLoadCompletedInMainFrame() override {
-    if (!IsDialogAutoResizable())
-      return;
-
-    EnableAutoResize();
-    if (GetWebContents())
+    if (IsDialogAutoResizable() && GetWebContents())
       constrained_window_->ShowWebContentsModalDialog();
   }
 
   // ConstrainedWindowMacDelegate interface
   void OnConstrainedWindowClosed(ConstrainedWindowMac* window) override {
     if (!impl_->closed_via_webui())
       GetWebDialogDelegate()->OnDialogClosed("");
     delete this;
   }
 
@@ skipping 28 matching lines @@
     content::BrowserContext* browser_context,
     WebDialogDelegate* delegate,
     content::WebContents* web_contents,
     const gfx::Size& min_size,
     const gfx::Size& max_size)
     : content::WebContentsObserver(web_contents),
       impl_(new ConstrainedWebDialogDelegateMac(browser_context, delegate,
             this)),
       min_size_(min_size),
       max_size_(max_size) {
-  if (IsDialogAutoResizable())
+  if (IsDialogAutoResizable()) {
     Observe(GetWebContents());
+    EnableAutoResize();
+  }
 
   // Create a window to hold web_contents in the constrained sheet:
   gfx::Size size;
   delegate->GetDialogSize(&size);
   // The window size for autoresizing dialogs will be determined at a later
   // time.
   NSRect frame = IsDialogAutoResizable() ? ui::kWindowSizeDeterminedLater :
       NSMakeRect(0, 0, size.width(), size.height());
 
   window_.reset([[ConstrainedWindowCustomWindow alloc]
@@ skipping 38 matching lines @@
     const gfx::Size& max_size) {
   DCHECK(!min_size.IsEmpty());
   DCHECK(!max_size.IsEmpty());
   // Deleted when the dialog closes.
   ConstrainedWebDialogDelegateViewMac* constrained_delegate =
       new ConstrainedWebDialogDelegateViewMac(
           browser_context, delegate, web_contents,
           min_size, max_size);
   return constrained_delegate;
 }