Add textfield internal padding from FocusableBorder.

ui/views/controls/combobox/combobox.cc

Index: ui/views/controls/combobox/combobox.cc
diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc
index bbba555a3e711aa57bcd738b1608a2493c353ea7..983958c15fdaa0b2c42403508a2c872500695227 100644
--- a/ui/views/controls/combobox/combobox.cc
+++ b/ui/views/controls/combobox/combobox.cc
@@ -32,6 +32,7 @@
 #include "ui/views/controls/menu/menu_runner_handler.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/controls/prefix_selector.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/ime/input_method.h"
 #include "ui/views/mouse_constants.h"
 #include "ui/views/painter.h"
@@ -410,6 +411,8 @@ gfx::Size Combobox::GetPreferredSize() const {
   // The preferred size will drive the local bounds which in turn is used to set
   // the minimum width for the dropdown list.
   gfx::Insets insets = GetInsets();
+  insets += gfx::Insets(Textfield::kTextPadding, Textfield::kTextPadding,
+                        Textfield::kTextPadding, Textfield::kTextPadding);
   int total_width = std::max(kMinComboboxWidth, content_size_.width()) +
       insets.width() + GetDisclosureArrowLeftPadding() +
       ArrowSize().width() + GetDisclosureArrowRightPadding();
@@ -628,7 +631,7 @@ void Combobox::UpdateFromModel() {
 void Combobox::UpdateBorder() {
   scoped_ptr<FocusableBorder> border(new FocusableBorder());
   if (style_ == STYLE_ACTION)
-    border->SetInsets(8, 13, 8, 13);
+    border->SetInsets(5, 10, 5, 10);

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

Should we be doing something like "8 - Textfield::kTextPadding" here?  Or do we
always want 5/10 px of additional inset if we change the textfield padding
amount in the future?

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

I don't think the intent is clear, so I figured I wouldn't complicate the code.
(Combobox should eventually be a MenuButton or match LabelButton height.)

   if (invalid_)
     border->SetColor(kWarningColor);
   SetBorder(border.PassAs<Border>());
@@ -640,6 +643,7 @@ void Combobox::AdjustBoundsForRTLUI(gfx::Rect* rect) const {
 
 void Combobox::PaintText(gfx::Canvas* canvas) {
   gfx::Insets insets = GetInsets();
+  insets += gfx::Insets(0, Textfield::kTextPadding, 0, Textfield::kTextPadding);
 
   gfx::ScopedCanvas scoped_canvas(canvas);
   canvas->ClipRect(GetContentsBounds());