[rAc OSX] Simplify the overlay controller.

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

 // Copyright 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_dialog_window_controller.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view_delegate.h"
@@ skipping 187 matching lines @@
 }
 
 - (void)requestRelayout {
   [self cancelRelayout];
   [self performSelector:@selector(performLayout) withObject:nil afterDelay:0.0];
 }
 
 - (NSSize)preferredSize {
   NSSize size;
 
-  // Overall size is determined by either main container or sign in view.
-  if ([[signInContainer_ view] isHidden])
-    size = [mainContainer_ preferredSize];
-  else
-    size = [signInContainer_ preferredSize];
+  if (![[overlayController_ view] isHidden]) {
+    size.height = [overlayController_ heightForWidth:size.width];
+  } else {
+    // Overall size is determined by either main container or sign in view.
+    if ([[signInContainer_ view] isHidden])
+      size = [mainContainer_ preferredSize];
+    else
+      size = [signInContainer_ preferredSize];
 
-  // Always make room for the header.
-  size.height += kDecorationHeight;
-
-  if (![[overlayController_ view] isHidden]) {
-    CGFloat height = [overlayController_ heightForWidth:size.width];
-    if (height != 0.0)
-      size.height = height;
+    // Always make room for the header.
+    size.height += kDecorationHeight;
   }
 
   // Show as much of the main view as is possible without going past the
   // bottom of the browser window.
   size.height = std::min(size.height, [self maxHeight]);
 
   return size;
 }
 
 - (void)performLayout {
@@ skipping 186 matching lines @@
 
 - (content::WebContents*)getSignInWebContents {
   return [signInContainer_ webContents];
 }
 
 - (BOOL)isShowingOverlay {
   return ![[overlayController_ view] isHidden];
 }
 
 @end