Correct padding and focus ring for frameless constrained window dialog

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

Index: chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.mm
diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.mm
index 05e326add109a876ab3bfce84437aa41ccf78582..9304345bb62a3351d5c3c29d213dd27f11d66a99 100644
--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.mm
+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.mm
@@ -10,6 +10,7 @@
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.h"
 #import "chrome/browser/ui/cocoa/hover_close_button.h"
 #import "chrome/browser/ui/constrained_window.h"
+#import "chrome/browser/ui/constrained_window_constants.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/cocoa/window_size_constants.h"
@@ -64,7 +65,7 @@ const CGFloat kButtonMinWidth = 72;
   [informativeTextField_ setAttributedStringValue:
       constrained_window::GetAttributedLabelString(
           string,
-          ConstrainedWindow::kTextFontStyle,
+          ConstrainedWindowConstants::kTextFontStyle,
           NSNaturalTextAlignment,
           NSLineBreakByWordWrapping)];
 }
@@ -77,7 +78,7 @@ const CGFloat kButtonMinWidth = 72;
   [messageTextField_ setAttributedStringValue:
       constrained_window::GetAttributedLabelString(
           string,
-          ConstrainedWindow::kTitleFontStyle,
+          ConstrainedWindowConstants::kTitleFontStyle,
           NSNaturalTextAlignment,
           NSLineBreakByWordWrapping)];
 }
@@ -139,13 +140,13 @@ const CGFloat kButtonMinWidth = 72;
   CGFloat windowWidth = buttonWidth;
   if (accessoryView_.get())
     windowWidth = std::max(windowWidth, NSWidth([accessoryView_ frame]));
-  windowWidth += ConstrainedWindow::kHorizontalPadding * 2;
+  windowWidth += ConstrainedWindowConstants::kHorizontalPadding * 2;
   windowWidth = std::max(windowWidth, kWindowMinWidth);
 
   // Layout controls.
   [self layoutButtonsWithWindowWidth:windowWidth];
   CGFloat curY = [buttons_ count] ? NSMaxY([[buttons_ lastObject] frame])
-                                  : ConstrainedWindow::kVerticalPadding;
+      : ConstrainedWindowConstants::kClientBottomPadding;
   curY = [self layoutAccessoryViewAtYPos:curY];
   curY = [self layoutTextField:informativeTextField_
                           yPos:curY
@@ -158,30 +159,30 @@ const CGFloat kButtonMinWidth = 72;
   [self layoutCloseButtonWithWindowWidth:windowWidth];
 
   // Update window frame.
-  curY += ConstrainedWindow::kVerticalPadding;
+  curY += ConstrainedWindowConstants::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;
+  CGFloat curX = windowWidth - ConstrainedWindowConstants::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 = ConstrainedWindowConstants::kClientBottomPadding;
     [button setFrameOrigin:rect.origin];
     curX = NSMinX(rect) - kButtonGap;
   }
 
   // Layout remaining buttons left to right.
-  curX = ConstrainedWindow::kHorizontalPadding;
+  curX = ConstrainedWindowConstants::kHorizontalPadding;
   for (int i = buttonCount - 1; i >= 2; --i) {
     NSButton* button = [buttons_ objectAtIndex:i];
     [button setFrameOrigin:
-        NSMakePoint(curX, ConstrainedWindow::kVerticalPadding)];
+        NSMakePoint(curX, ConstrainedWindowConstants::kClientBottomPadding)];
     curX += NSMaxX([button frame]) + kButtonGap;
   }
 }
@@ -196,9 +197,10 @@ const CGFloat kButtonMinWidth = 72;
 
   [textField setHidden:NO];
   NSRect rect;
-  rect.origin.y = yPos + ConstrainedWindow::kRowPadding;
-  rect.origin.x = ConstrainedWindow::kHorizontalPadding;
-  rect.size.width = windowWidth - ConstrainedWindow::kHorizontalPadding * 2;
+  rect.origin.y = yPos + ConstrainedWindowConstants::kRowPadding;
+  rect.origin.x = ConstrainedWindowConstants::kHorizontalPadding;
+  rect.size.width = windowWidth -
+      ConstrainedWindowConstants::kHorizontalPadding * 2;
   rect.size.height = 1;
   [textField setFrame:rect];
   [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:textField];
@@ -209,8 +211,8 @@ const CGFloat kButtonMinWidth = 72;
   if (!accessoryView_.get())
     return yPos;
   NSRect frame = [accessoryView_ frame];
-  frame.origin.y = yPos + ConstrainedWindow::kRowPadding;
-  frame.origin.x = ConstrainedWindow::kHorizontalPadding;
+  frame.origin.y = yPos + ConstrainedWindowConstants::kRowPadding;
+  frame.origin.x = ConstrainedWindowConstants::kHorizontalPadding;
   [accessoryView_ setFrameOrigin:frame.origin];
   return NSMaxY(frame);
 }
@@ -219,8 +221,8 @@ const CGFloat kButtonMinWidth = 72;
   NSRect frame;
   frame.size.width = ConstrainedWindow::GetCloseButtonSize();
   frame.size.height = ConstrainedWindow::GetCloseButtonSize();
-  frame.origin.x =
-      windowWidth - ConstrainedWindow::kHorizontalPadding - NSWidth(frame);
+  frame.origin.x = windowWidth -
+      ConstrainedWindowConstants::kHorizontalPadding - NSWidth(frame);
   frame.origin.y = NSMaxY([messageTextField_ frame]) - NSHeight(frame);
   [closeButton_ setFrame:frame];
 }