Add textfield internal padding from FocusableBorder.

chrome/browser/ui/views/cookie_info_view.cc

Index: chrome/browser/ui/views/cookie_info_view.cc
diff --git a/chrome/browser/ui/views/cookie_info_view.cc b/chrome/browser/ui/views/cookie_info_view.cc
index 18902c79b67cdabeb709eb6cd555f9e7636974d5..935886e4139ae3dd19e886eb835ccc663a429f7f 100644
--- a/chrome/browser/ui/views/cookie_info_view.cc
+++ b/chrome/browser/ui/views/cookie_info_view.cc
@@ -27,13 +27,6 @@
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/window/dialog_delegate.h"
 
-namespace {
-
-// Adjustment to the spacing between subsequent label-field lines.
-const int kExtraLineHeightPadding = 3;
-
-}  // namespace
-
 ///////////////////////////////////////////////////////////////////////////////
 // CookieInfoView, public:
 
@@ -118,22 +111,22 @@ void CookieInfoView::ViewHierarchyChanged(
     Init();
 }
 
-void CookieInfoView::AddLabelRow(int layout_id, views::GridLayout* layout,
+void CookieInfoView::AddLabelRow(int layout_id,
+                                 views::GridLayout* layout,
                                  views::Label* label,
-                                 views::Textfield* text_field) {
+                                 views::Textfield* textfield) {
   layout->StartRow(0, layout_id);
   layout->AddView(label);
-  layout->AddView(text_field, 2, 1, views::GridLayout::FILL,
-                  views::GridLayout::CENTER);
-  layout->AddPaddingRow(0, kExtraLineHeightPadding);

[sky, 2014/09/09 15:18:01]

Why did you remove this?

[msw, 2014/09/09 17:01:05]

The internal padding of the textfield now offers enough vertical buffer for this
layout. Twice the old amount, in fact. If you prefer, I can keep the constant
and subtract the insets for a padding row of 3-3=0 (or 3-6...), like Peter
requested for the location bar.

+  layout->AddView(
+      textfield, 2, 1, views::GridLayout::FILL, views::GridLayout::CENTER);
 
   // Now that the Textfield is in the view hierarchy, it can be initialized.
-  text_field->SetReadOnly(true);
-  text_field->SetBorder(views::Border::NullBorder());
+  textfield->SetReadOnly(true);
+  textfield->SetBorder(views::Border::NullBorder());
   // Color these borderless text areas the same as the containing dialog.
-  text_field->SetBackgroundColor(GetNativeTheme()->GetSystemColor(
+  textfield->SetBackgroundColor(GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_DialogBackground));
-  text_field->SetTextColor(SkColorSetRGB(0x78, 0x78, 0x78));
+  textfield->SetTextColor(SkColorSetRGB(0x78, 0x78, 0x78));
 }
 
 ///////////////////////////////////////////////////////////////////////////////