[rAC, OSX] Force better initial size for sign-in (2nd try)

chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.mm

 // Copyright (c) 2013 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.
 
 #import "chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 19 matching lines @@
   webContents_.reset(
       content::WebContents::Create(
           content::WebContents::CreateParams(dialog_->delegate()->profile())));
   NSView* webContentView = webContents_->GetView()->GetNativeView();
   [self setView:webContentView];
 }
 
 - (void)loadSignInPage {
   DCHECK(webContents_.get());
 
-  // Prevent accidentaly empty |maxSize_|.
-  if (NSEqualSizes(NSMakeSize(0, 0), maxSize_)) {
-    maxSize_ = [[[self view] window] frame].size;
-    maxSize_.height -= chrome_style::kClientBottomPadding;
-  }
+  // Ensure initial minimum size doesn't cause resize.
+  NSSize initialMinSize = [[self view] frame].size;
+
+  // Ensure |maxSize_| is bigger than |initialMinSize|.
+  maxSize_.height = std::max(maxSize_.height, initialMinSize.height);
+  maxSize_.width = std::max(maxSize_.width, initialMinSize.width);
 
   signInDelegate_.reset(
       new autofill::AutofillDialogSignInDelegate(
           dialog_, webContents_.get(),
           dialog_->delegate()->GetWebContents()->GetDelegate(),
-          gfx::Size(NSSizeToCGSize(minSize_)),
+          gfx::Size(NSSizeToCGSize(initialMinSize)),
           gfx::Size(NSSizeToCGSize(maxSize_))));
   webContents_->GetController().LoadURL(
       dialog_->delegate()->SignInUrl(),
       content::Referrer(),
       content::PAGE_TRANSITION_AUTO_TOPLEVEL,
       std::string());
 }
 
 - (content::NavigationController*)navigationController {
   return &webContents_->GetController();
@@ skipping 26 matching lines @@
   preferredSize_ = size;
   preferredSize_.height += chrome_style::kClientBottomPadding;
 
   // Always request re-layout if preferredSize changes.
   id delegate = [[[self view] window] windowController];
   if ([delegate respondsToSelector:@selector(requestRelayout)])
     [delegate performSelector:@selector(requestRelayout)];
 }
 
 @end