Correct padding and focus ring for frameless constrained window dialog

ui/views/controls/message_box_view.cc

Index: ui/views/controls/message_box_view.cc
diff --git a/ui/views/controls/message_box_view.cc b/ui/views/controls/message_box_view.cc
index fcde521a1910a97fdd8b1780c48a5d28155195ff..59607670642680c26c9132c362cba36446e8a980 100644
--- a/ui/views/controls/message_box_view.cc
+++ b/ui/views/controls/message_box_view.cc
@@ -250,6 +250,9 @@ void MessageBoxView::ResetLayoutManager() {
                           GridLayout::USE_PREF, 0, 0);
   }
 
+  // Account for message font descent.
+  int descent = 0;
+
   for (size_t i = 0; i < message_labels_.size(); ++i) {
     layout->StartRow(i, message_column_view_set_id);
     if (icon_) {
@@ -259,21 +262,24 @@ void MessageBoxView::ResetLayoutManager() {
         layout->SkipColumns(1);
     }
     layout->AddView(message_labels_[i]);
+    descent = 3;
   }
 
   if (prompt_field_) {
     layout->AddPaddingRow(0, inter_row_vertical_spacing_);
     layout->StartRow(0, textfield_column_view_set_id);
     layout->AddView(prompt_field_);
+    descent = 3;
   }
 
   if (checkbox_) {
     layout->AddPaddingRow(0, inter_row_vertical_spacing_);
     layout->StartRow(0, checkbox_column_view_set_id);
     layout->AddView(checkbox_);
+    descent = 3;
   }
 
-  layout->AddPaddingRow(0, inter_row_vertical_spacing_);
+  layout->AddPaddingRow(0, inter_row_vertical_spacing_ - descent);

[Mike Wittman, 2012/10/09 22:55:46]

This should be behind the flag.  Also, is this class used in non-constrained
window contexts?  If so, and we don't want to adopt this layout universally,
you'll need to make this configurable and plumb the setting from the relevant
dialogs.

[please use gerrit instead, 2012/10/10 19:12:58]

The word from UX (kenmoore@) is to adjust the regular spacing instead of
accounting for font descents, ascents, x-heights, and baselines.

 }
 
 }  // namespace views