Add textfield internal padding from FocusableBorder.

ui/views/controls/textfield/textfield.cc

Index: ui/views/controls/textfield/textfield.cc
diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc
index bedee3a1c0c8cabcece0a1f5d192c79e9f5d5191..a77b6855c6db48db8d7ea4a03115dcd2a5f798de 100644
--- a/ui/views/controls/textfield/textfield.cc
+++ b/ui/views/controls/textfield/textfield.cc
@@ -238,6 +238,7 @@ int GetViewsCommand(const ui::TextEditCommandAuraLinux& command, bool rtl) {
 
 // static
 const char Textfield::kViewClassName[] = "Textfield";
+const int Textfield::kTextPadding = 3;
 
 // static
 size_t Textfield::GetCaretBlinkMs() {
@@ -555,7 +556,8 @@ int Textfield::GetBaseline() const {
 }
 
 gfx::Size Textfield::GetPreferredSize() const {
-  const gfx::Insets& insets = GetInsets();
+  gfx::Insets insets = GetInsets();
+  insets += gfx::Insets(kTextPadding, kTextPadding, kTextPadding, kTextPadding);
   return gfx::Size(GetFontList().GetExpectedTextWidth(default_width_in_chars_) +
                    insets.width(), GetFontList().GetHeight() + insets.height());
 }
@@ -919,7 +921,10 @@ void Textfield::GetAccessibleState(ui::AXViewState* state) {
 }
 
 void Textfield::OnBoundsChanged(const gfx::Rect& previous_bounds) {
-  GetRenderText()->SetDisplayRect(GetContentsBounds());
+  // Allow the text to paint over vertical padding, but not horizontal padding.

[Peter Kasting, 2014/08/29 21:09:11]

Nit: Maybe fill this comment out more?  Something about why we have the padding
we do by default, what cases might want to paint over the vertical padding, and
why this is better than other solutions?

[msw, 2014/08/30 00:17:48]

Done.

+  gfx::Rect bounds = GetContentsBounds();
+  bounds.Inset(kTextPadding, 0);
+  GetRenderText()->SetDisplayRect(bounds);
   OnCaretBoundsChanged();
 }