[Autofill] Add Details Section

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 "chrome/browser/ui/chrome_style.h"
 #include "base/mac/bundle_locations.h"
 #include "base/memory/scoped_nsobject.h"
+#include "chrome/browser/ui/chrome_style.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h"
 #include "chrome/browser/ui/chrome_style.h"
 #include "chrome/browser/ui/chrome_style.h"
+#import "chrome/browser/ui/cocoa/autofill/autofill_details_container.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_main_container.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.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 "ui/base/cocoa/window_size_constants.h"
 
 namespace autofill {
 
 // static
 AutofillDialogView* AutofillDialogView::Create(
     AutofillDialogController* controller) {
   return new AutofillDialogCocoa(controller);
 }
 
 AutofillDialogCocoa::AutofillDialogCocoa(AutofillDialogController* controller)
@@ skipping 75 matching lines @@
 }  // autofill
 
 #pragma mark Window Controller
 
 @implementation AutofillDialogWindowController
 
 - (id)initWithWebContents:(content::WebContents*)webContents
       autofillDialog:(autofill::AutofillDialogCocoa*)autofillDialog {
   DCHECK(webContents);
 
-  // TODO(groby): Should be ui::kWindowSizeDeterminedLater
-  NSRect frame = NSMakeRect(0, 0, 550, 600);
   scoped_nsobject<ConstrainedWindowCustomWindow> window(
-      [[ConstrainedWindowCustomWindow alloc] initWithContentRect:frame]);
+      [[ConstrainedWindowCustomWindow alloc]
+          initWithContentRect:ui::kWindowSizeDeterminedLater]);
 
   if ((self = [super initWithWindow:window])) {
     webContents_ = webContents;
     autofillDialog_ = autofillDialog;
 
-    NSRect clientFrame = NSInsetRect(
-        frame, chrome_style::kHorizontalPadding, 0);
-    clientFrame.size.height -= chrome_style::kTitleTopPadding +
-                               chrome_style::kClientBottomPadding;
-    clientFrame.origin.y = chrome_style::kClientBottomPadding;
     mainContainer_.reset([[AutofillMainContainer alloc]
                              initWithController:autofillDialog->controller()]);
     [mainContainer_ setTarget:self];
-    [[mainContainer_ view] setFrame:clientFrame];
 
     signInContainer_.reset(
         [[AutofillSignInContainer alloc]
             initWithController:autofillDialog->controller()]);
     [[signInContainer_ view] setHidden:YES];
-    [[signInContainer_ view] setFrame:clientFrame];
+
+    NSRect clientRect = [[mainContainer_ view] frame];
+    clientRect.origin = NSMakePoint(chrome_style::kClientBottomPadding,
+                                    chrome_style::kHorizontalPadding);
+    NSRect contentRect = clientRect;

[sail, 2013/05/01 17:12:36]

move this closer to where it's used?

[groby-ooo-7-16, 2013/05/01 20:37:44]

Done.

+    contentRect.origin = NSMakePoint(0, 0);
+    contentRect.size.width += 2 * chrome_style::kHorizontalPadding;
+    contentRect.size.height += chrome_style::kClientBottomPadding +
+                               chrome_style::kTitleTopPadding;
+    [[mainContainer_ view] setFrame:clientRect];
+    [[signInContainer_ view] setFrame:clientRect];
 
     [[[self window] contentView] setSubviews:
         @[[mainContainer_ view], [signInContainer_ view]]];
+    [[[self window] contentView] setFrame:contentRect];
+    NSRect frame = [[self window] frameRectForContentRect:contentRect];
+    [[self window] setFrame:frame display:YES];
   }
   return self;
 }
 
 - (void)updateAccountChooser {
   [[mainContainer_ accountChooser] update];
 }
 
 - (content::NavigationController*)showSignIn {
   [signInContainer_ loadSignInPage];
   [[mainContainer_ view] setHidden:YES];
   [[signInContainer_ view] setHidden:NO];
 
   return [signInContainer_ navigationController];
 }
 
 - (void)hideSignIn {
   [[signInContainer_ view] setHidden:YES];
   [[mainContainer_ view] setHidden:NO];
 }
 
 
 - (IBAction)closeSheet:(id)sender {
   autofillDialog_->PerformClose();
 }
 
 @end