[rAc OSX] Simplify the overlay controller.

chrome/browser/ui/cocoa/autofill/autofill_overlay_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_overlay_controller.h"
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
@@ skipping 118 matching lines @@
 - (id)initWithDelegate:(autofill::AutofillDialogViewDelegate*)delegate {
   if (self = [super initWithNibName:nil bundle:nil]) {
     delegate_ = delegate;
 
     base::scoped_nsobject<NSBox> view([[NSBox alloc] initWithFrame:NSZeroRect]);
     [view setBoxType:NSBoxCustom];
     [view setBorderType:NSNoBorder];
     [view setContentViewMargins:NSZeroSize];
     [view setTitlePosition:NSNoTitle];
 
-    childView_.reset([[NSView alloc] initWithFrame:NSZeroRect]);
     messageView_.reset([[AutofillMessageView alloc] initWithFrame:NSZeroRect]);
     imageView_.reset([[NSImageView alloc] initWithFrame:NSZeroRect]);
     [imageView_ setImageAlignment:NSImageAlignCenter];
 
-    [childView_ setSubviews:@[messageView_, imageView_]];
-    [view addSubview:childView_];
+    [view setSubviews:@[messageView_, imageView_]];
     [self setView:view];
+
+    [view setFillColor:[[view window] backgroundColor]];

[groby-ooo-7-16, 2013/11/22 14:24:03]

This could also go if we just change contentView...

   }
   return self;
 }
 
 - (void)updateState {
   const autofill::DialogOverlayState& state = delegate_->GetDialogOverlay();
 
   if (state.image.IsEmpty()) {
     [[self view] setHidden:YES];
     return;
   }
 
-  NSBox* view = base::mac::ObjCCastStrict<NSBox>([self view]);
-  [view setFillColor:[[view window] backgroundColor]];
-  [view setAlphaValue:1];
-  [childView_ setAlphaValue:1];
+  [[self view] setHidden:NO];
   [imageView_ setImage:state.image.ToNSImage()];
   [messageView_ setMessage:state.string];
-  [childView_ setHidden:NO];
-  [view setHidden:NO];
 
   NSWindowController* delegate = [[[self view] window] windowController];
   if ([delegate respondsToSelector:@selector(requestRelayout)])
     [delegate performSelector:@selector(requestRelayout)];
 }
 
-- (CGFloat)heightForWidth:(int) width {
-  // 0 means "no preference". Image-only overlays fit the container.
-  if ([messageView_ isHidden])
-    return 0;
-
-  // Overlays with text messages express a size preference.
+- (CGFloat)heightForWidth:(int)width {
   return 2 * kOverlayImageVerticalPadding +
       [messageView_ heightForWidth:width] +
       [[imageView_ image] size].height;
 }
 
 - (NSSize)preferredSize {
   NOTREACHED();  // Only implemented as part of AutofillLayout protocol.
   return NSZeroSize;
 }
 
 - (void)performLayout {
   NSRect bounds = [[self view] bounds];
-  [childView_ setFrame:bounds];
-  if ([messageView_ isHidden]) {
-    [imageView_ setFrame:bounds];
-    return;
-  }
 
   int messageHeight = [messageView_ heightForWidth:NSWidth(bounds)];
   [messageView_ setFrame:NSMakeRect(0, 0, NSWidth(bounds), messageHeight)];
   [messageView_ performLayout];
 
   NSSize imageSize = [[imageView_ image] size];
   [imageView_ setFrame:NSMakeRect(
        0, NSMaxY([messageView_ frame]) + kOverlayImageVerticalPadding,
        NSWidth(bounds), imageSize.height)];
 }
 
 @end