[rAc OSX] Factor out AutofillHeader class to contain dialog header elements.

chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.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.
 
 #include "chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.h"
 
 #include "base/bind.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view_delegate.h"
 #include "chrome/browser/ui/chrome_style.h"
-#import "chrome/browser/ui/cocoa/autofill/autofill_account_chooser.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_details_container.h"
 #include "chrome/browser/ui/cocoa/autofill/autofill_dialog_constants.h"
+#import "chrome/browser/ui/cocoa/autofill/autofill_header.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_input_field.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_main_container.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_overlay_controller.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_section_container.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_textfield.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #import "ui/base/cocoa/flipped_view.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/platform_font.h"
 
-const CGFloat kAccountChooserHeight = 20.0;
 const CGFloat kMinimumContentsHeight = 101;
 
 // Height of all decorations & paddings on main dialog together.
-const CGFloat kDecorationHeight = kAccountChooserHeight +
+const CGFloat kDecorationHeight = autofill::kAccountChooserHeight +

[groby-ooo-7-16, 2013/11/20 23:51:44]

If this is part of the header, why do we need this in size computations?

[Ilya Sherman, 2013/11/22 05:01:13]

Done.

                                   autofill::kDetailVerticalPadding +
                                   chrome_style::kClientBottomPadding +
                                   chrome_style::kTitleTopPadding;
 
 namespace autofill {
 
 // static
 AutofillDialogView* AutofillDialogView::Create(
     AutofillDialogViewDelegate* delegate) {
   return new AutofillDialogCocoa(delegate);
 }
 
 AutofillDialogCocoa::AutofillDialogCocoa(AutofillDialogViewDelegate* delegate)
     : close_weak_ptr_factory_(this),
       delegate_(delegate) {
 }
 
 AutofillDialogCocoa::~AutofillDialogCocoa() {
   // Cancel potential relayout requests, since the AutofillDialogController
   // is about to go away, but relayout requests assume it will still exist.
   [sheet_delegate_ cancelRelayout];
 }
 
 void AutofillDialogCocoa::Show() {
   // This should only be called once.
   DCHECK(!sheet_delegate_.get());
   sheet_delegate_.reset([[AutofillDialogWindowController alloc]
        initWithWebContents:delegate_->GetWebContents()
-            autofillDialog:this]);
+                    dialog:this]);
   base::scoped_nsobject<CustomConstrainedWindowSheet> sheet(
       [[CustomConstrainedWindowSheet alloc]
           initWithCustomWindow:[sheet_delegate_ window]]);
   constrained_window_.reset(
       new ConstrainedWindowMac(this, delegate_->GetWebContents(), sheet));
   [sheet_delegate_ show];
 }
 
 void AutofillDialogCocoa::Hide() {
   [sheet_delegate_ hide];
@@ skipping 224 matching lines @@
   }
   return fieldEditor_.get();
 }
 
 @end
 
 
 @implementation AutofillDialogWindowController
 
 - (id)initWithWebContents:(content::WebContents*)webContents
-      autofillDialog:(autofill::AutofillDialogCocoa*)autofillDialog {
+                   dialog:(autofill::AutofillDialogCocoa*)dialog {
   DCHECK(webContents);
 
   base::scoped_nsobject<ConstrainedWindowCustomWindow> window(
       [[ConstrainedWindowCustomWindow alloc]
           initWithContentRect:ui::kWindowSizeDeterminedLater]);
 
   if ((self = [super initWithWindow:window])) {
     [window setDelegate:self];
     webContents_ = webContents;
-    autofillDialog_ = autofillDialog;
+    dialog_ = dialog;
+
+    header_.reset([[AutofillHeader alloc] initWithDelegate:dialog->delegate()]);
 
     mainContainer_.reset([[AutofillMainContainer alloc]
-                             initWithDelegate:autofillDialog->delegate()]);
+                             initWithDelegate:dialog->delegate()]);
     [mainContainer_ setTarget:self];
 
     signInContainer_.reset(
-        [[AutofillSignInContainer alloc] initWithDialog:autofillDialog]);
+        [[AutofillSignInContainer alloc] initWithDialog:dialog]);
     [[signInContainer_ view] setHidden:YES];
 
-    // Set dialog title.
-    titleTextField_.reset([[NSTextField alloc] initWithFrame:NSZeroRect]);
-    [titleTextField_ setEditable:NO];
-    [titleTextField_ setBordered:NO];
-    [titleTextField_ setDrawsBackground:NO];
-    [titleTextField_ setFont:[NSFont systemFontOfSize:15.0]];
-    [titleTextField_ setStringValue:
-        base::SysUTF16ToNSString(autofillDialog->delegate()->DialogTitle())];
-    [titleTextField_ sizeToFit];
-
-    accountChooser_.reset([[AutofillAccountChooser alloc]
-                              initWithFrame:NSZeroRect
-                                   delegate:autofillDialog->delegate()]);
-
     loadingShieldTextField_.reset(
         [[NSTextField alloc] initWithFrame:NSZeroRect]);
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     NSFont* loadingFont = rb.GetFont(
         ui::ResourceBundle::BaseFont).DeriveFont(15).GetNativeFont();
     [loadingShieldTextField_ setFont:loadingFont];
     [loadingShieldTextField_ setEditable:NO];
     [loadingShieldTextField_ setBordered:NO];
     [loadingShieldTextField_ setDrawsBackground:NO];
 
     base::scoped_nsobject<AutofillOpaqueView> loadingShieldView(
         [[AutofillOpaqueView alloc] initWithFrame:NSZeroRect]);
     [loadingShieldView setHidden:YES];
     [loadingShieldView addSubview:loadingShieldTextField_];
 
     overlayController_.reset(
         [[AutofillOverlayController alloc] initWithDelegate:
-            autofillDialog->delegate()]);
+            dialog->delegate()]);
     [[overlayController_ view] setHidden:YES];
 
     // This needs a flipped content view because otherwise the size
     // animation looks odd. However, replacing the contentView for constrained
     // windows does not work - it does custom rendering.
     base::scoped_nsobject<NSView> flippedContentView(
         [[FlippedView alloc] initWithFrame:
             [[[self window] contentView] frame]]);
     [flippedContentView setSubviews:
-        @[accountChooser_,
-          titleTextField_,
+        @[header_,
           [mainContainer_ view],
           [signInContainer_ view],
           loadingShieldView,
           [overlayController_ view]]];
     [flippedContentView setAutoresizingMask:
         (NSViewWidthSizable | NSViewHeightSizable)];
     [[[self window] contentView] addSubview:flippedContentView];
-    [mainContainer_ setAnchorView:[[accountChooser_ subviews] objectAtIndex:1]];
+    [mainContainer_ setAnchorView:[header_ anchorView]];
   }
   return self;
 }
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }
 
 - (CGFloat)maxHeight {
@@ skipping 28 matching lines @@
                                              object:nil];
 }
 
 - (void)requestRelayout {
   [self cancelRelayout];
   [self performSelector:@selector(performLayout) withObject:nil afterDelay:0.0];
 }
 
 - (NSSize)preferredSize {
   NSSize size;
 

[groby-ooo-7-16, 2013/11/20 23:51:44]

Header size probably needs to be taken into account here.

[Ilya Sherman, 2013/11/22 05:01:13]

Done.

   // 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;
   }
 
   // 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 {
   NSRect contentRect = NSZeroRect;
   contentRect.size = [self preferredSize];
   NSRect clientRect = contentRect;
-  clientRect.origin.y = chrome_style::kTitleTopPadding;
-  clientRect.size.height -= chrome_style::kTitleTopPadding +
-                            chrome_style::kClientBottomPadding;
+  clientRect.size.height -= chrome_style::kClientBottomPadding;
 
-  [titleTextField_ setStringValue:
-      base::SysUTF16ToNSString(autofillDialog_->delegate()->DialogTitle())];
-  [titleTextField_ sizeToFit];
+  CGFloat headerHeight = [header_ heightForWidth:NSWidth(clientRect)];
+  NSRect headerRect, mainRect;
+  NSDivideRect(clientRect, &headerRect, &mainRect, headerHeight, NSMinYEdge);
 
-  NSRect headerRect, mainRect, titleRect, dummyRect;
-  NSDivideRect(clientRect, &headerRect, &mainRect,
-               kAccountChooserHeight, NSMinYEdge);
-  NSDivideRect(mainRect, &dummyRect, &mainRect,
-               autofill::kDetailVerticalPadding, NSMinYEdge);
-  headerRect = NSInsetRect(headerRect, chrome_style::kHorizontalPadding, 0);
-  NSDivideRect(headerRect, &titleRect, &headerRect,
-               NSWidth([titleTextField_ frame]), NSMinXEdge);
+  [header_ setFrame:headerRect];
+  [header_ performLayout];
 
-  // Align baseline of title with bottom of accountChooser.
-  base::scoped_nsobject<NSLayoutManager> layout_manager(
-      [[NSLayoutManager alloc] init]);
-  NSFont* titleFont = [titleTextField_ font];
-  titleRect.origin.y += NSHeight(titleRect) -
-      [layout_manager defaultBaselineOffsetForFont:titleFont];
-  [titleTextField_ setFrame:titleRect];
-
-  [accountChooser_ setFrame:headerRect];
-  [accountChooser_ performLayout];
   if ([[signInContainer_ view] isHidden]) {
     [[mainContainer_ view] setFrame:mainRect];
     [mainContainer_ performLayout];
   } else {
     [[signInContainer_ view] setFrame:mainRect];
   }
 
   // Loading shield has text centered in the content rect.
   NSRect textFrame = [loadingShieldTextField_ frame];
   textFrame.origin.x =
       std::ceil((NSWidth(contentRect) - NSWidth(textFrame)) / 2.0);
   textFrame.origin.y =
     std::ceil((NSHeight(contentRect) - NSHeight(textFrame)) / 2.0);
   [loadingShieldTextField_ setFrame:textFrame];
   [[loadingShieldTextField_ superview] setFrame:contentRect];
 
   [[overlayController_ view] setFrame:contentRect];
   [overlayController_ performLayout];
 
   NSRect frameRect = [[self window] frameRectForContentRect:contentRect];
   [[self window] setFrame:frameRect display:YES];
   [[self window] recalculateKeyViewLoop];
 }
 
 - (IBAction)accept:(id)sender {
   if ([mainContainer_ validate])
-    autofillDialog_->delegate()->OnAccept();
+    dialog_->delegate()->OnAccept();
   else
     [mainContainer_ makeFirstInvalidInputFirstResponder];
 }
 
 - (IBAction)cancel:(id)sender {
-  autofillDialog_->delegate()->OnCancel();
-  autofillDialog_->PerformClose();
+  dialog_->delegate()->OnCancel();
+  dialog_->PerformClose();
 }
 
 - (void)show {
   // Resizing the browser causes the ConstrainedWindow to move.
   // Observe that to allow resizes based on browser size.
   // NOTE: This MUST come last after all initial setup is done, because there
   // is an immediate notification post registration.
   DCHECK([self window]);
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(onContentViewFrameDidChange:)
              name:NSWindowDidMoveNotification
            object:[self window]];
 
   [self updateAccountChooser];
   [self updateNotificationArea];
   [self requestRelayout];
 }
 
 - (void)hide {
-  autofillDialog_->delegate()->OnCancel();
-  autofillDialog_->PerformClose();
+  dialog_->delegate()->OnCancel();
+  dialog_->PerformClose();
 }
 
 - (void)updateNotificationArea {
   [mainContainer_ updateNotificationArea];
 }
 
 - (void)updateAccountChooser {
-  [accountChooser_ update];
+  [header_ update];
   [mainContainer_ updateLegalDocuments];
 
   NSString* newLoadingMessage = @"";
-  if (autofillDialog_->delegate()->ShouldShowSpinner())
+  if (dialog_->delegate()->ShouldShowSpinner())
     newLoadingMessage = l10n_util::GetNSStringWithFixup(IDS_TAB_LOADING_TITLE);
   if (![newLoadingMessage isEqualToString:
        [loadingShieldTextField_ stringValue]]) {
     NSView* loadingShieldView = [loadingShieldTextField_ superview];
     [loadingShieldTextField_ setStringValue:newLoadingMessage];
     [loadingShieldTextField_ sizeToFit];
 
     BOOL showShield = ([newLoadingMessage length] != 0);
 
     // For the duration of the loading shield, hide the main contents.
@@ skipping 97 matching lines @@
 
 - (content::WebContents*)getSignInWebContents {
   return [signInContainer_ webContents];
 }
 
 - (BOOL)IsShowingOverlay {
   return ![[overlayController_ view] isHidden];
 }
 
 @end