Correct padding and focus ring for frameless constrained window dialog

chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.mm

 // Copyright (c) 2012 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/constrained_window/constrained_window_alert.h"
 
 #import "base/logging.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_control_utils.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.h"
@@ skipping 127 matching lines @@
   // Window width.
   CGFloat windowWidth = buttonWidth;
   if (accessoryView_.get())
     windowWidth = std::max(windowWidth, NSWidth([accessoryView_ frame]));
   windowWidth += ConstrainedWindow::kHorizontalPadding * 2;
   windowWidth = std::max(windowWidth, kWindowMinWidth);
 
   // Layout controls.
   [self layoutButtonsWithWindowWidth:windowWidth];
   CGFloat curY = [buttons_ count] ? NSMaxY([[buttons_ lastObject] frame])
-                                  : ConstrainedWindow::kVerticalPadding;
+                                  : ConstrainedWindow::kClientBottomPadding;
   curY = [self layoutAccessoryViewAtYPos:curY];
   curY = [self layoutTextField:informativeTextField_
                           yPos:curY
                    windowWidth:windowWidth];
   CGFloat availableMessageWidth =
       windowWidth - ConstrainedWindow::GetCloseButtonSize() - kButtonGap;
   curY = [self layoutTextField:messageTextField_
                           yPos:curY
                    windowWidth:availableMessageWidth];
   [self layoutCloseButtonWithWindowWidth:windowWidth];
 
   // Update window frame.
-  curY += ConstrainedWindow::kVerticalPadding;
+  curY += ConstrainedWindow::kTitleTopPadding;
   [window_ setFrame:NSMakeRect(0, 0, windowWidth, curY)
             display:NO];
 }
 
 - (void)layoutButtonsWithWindowWidth:(CGFloat)windowWidth {
   // Layout first 2 button right to left.
   CGFloat curX = windowWidth - ConstrainedWindow::kHorizontalPadding;
   const int buttonCount = [buttons_ count];
   for (int i = 0; i < std::min(2, buttonCount); ++i) {
     NSButton* button = [buttons_ objectAtIndex:i];
     NSRect rect = [button frame];
     rect.origin.x = curX - NSWidth(rect);
-    rect.origin.y = ConstrainedWindow::kVerticalPadding;
+    rect.origin.y = ConstrainedWindow::kClientBottomPadding;
     [button setFrameOrigin:rect.origin];
     curX = NSMinX(rect) - kButtonGap;
   }
 
   // Layout remaining buttons left to right.
   curX = ConstrainedWindow::kHorizontalPadding;
   for (int i = buttonCount - 1; i >= 2; --i) {
     NSButton* button = [buttons_ objectAtIndex:i];
     [button setFrameOrigin:
-        NSMakePoint(curX, ConstrainedWindow::kVerticalPadding)];
+        NSMakePoint(curX, ConstrainedWindow::kClientBottomPadding)];
     curX += NSMaxX([button frame]) + kButtonGap;
   }
 }
 
 - (CGFloat)layoutTextField:(NSTextField*)textField
                       yPos:(CGFloat)yPos
                windowWidth:(CGFloat)windowWidth {
   if (![[textField stringValue] length]) {
     [textField setHidden:YES];
     return yPos;
@@ skipping 24 matching lines @@
   NSRect frame;
   frame.size.width = ConstrainedWindow::GetCloseButtonSize();
   frame.size.height = ConstrainedWindow::GetCloseButtonSize();
   frame.origin.x =
       windowWidth - ConstrainedWindow::kHorizontalPadding - NSWidth(frame);
   frame.origin.y = NSMaxY([messageTextField_ frame]) - NSHeight(frame);
   [closeButton_ setFrame:frame];
 }
 
 @end