Add textfield internal padding from FocusableBorder.

chrome/browser/ui/views/location_bar/location_bar_view.cc

Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 3c2dff689f14c533fbb6da81aeef349f70675aa1..af087f1cb620220a7c45ed4af25805683e32d7d4 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -664,7 +664,7 @@ gfx::Size LocationBarView::GetPreferredSize() const {
     leading_width +=
         kItemPadding + location_icon_view_->GetMinimumSize().width();
   }
-  leading_width += kItemPadding - GetEditLeadingInternalSpace();
+  leading_width += GetEditLeadingInternalSpace();

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

Hmm, I worry about this implicitly assuming that kItemPadding ==
Textfield::kTextPadding.

I think these sorts of places should be doing "kItemPadding -
Textfield::kTextPadding" instead.

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

Done :-/ I also fixed the inversion of GetEditLeadingInternalSpace()...

 
   // Compute width of omnibox-trailing content.
   int trailing_width = search_button_->visible() ?
@@ -677,7 +677,7 @@ gfx::Size LocationBarView::GetPreferredSize() const {
       IncrementalMinimumWidth(zoom_view_) +
       IncrementalMinimumWidth(generated_credit_card_view_) +
       IncrementalMinimumWidth(mic_search_view_) +
-      IncrementalMinimumWidth(add_to_app_launcher_view_) + kItemPadding;
+      IncrementalMinimumWidth(add_to_app_launcher_view_);
   for (PageActionViews::const_iterator i(page_action_views_.begin());
        i != page_action_views_.end(); ++i)
     trailing_width += IncrementalMinimumWidth((*i));
@@ -701,10 +701,8 @@ void LocationBarView::Layout() {
   keyword_hint_view_->SetVisible(false);
 
   LocationBarLayout leading_decorations(
-      LocationBarLayout::LEFT_EDGE,
-      kItemPadding - GetEditLeadingInternalSpace());
-  LocationBarLayout trailing_decorations(LocationBarLayout::RIGHT_EDGE,
-                                         kItemPadding);
+      LocationBarLayout::LEFT_EDGE, -GetEditLeadingInternalSpace());
+  LocationBarLayout trailing_decorations(LocationBarLayout::RIGHT_EDGE, 0);
 
   const int origin_chip_preferred_width =
       origin_chip_view_->GetPreferredSize().width();