Add textfield internal padding from FocusableBorder.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 646 matching lines @@
   if (ShouldShowKeywordBubble()) {
     // The selected keyword view can collapse completely.
   } else if (ShouldShowEVBubble()) {
     leading_width += kBubblePadding +
         ev_bubble_view_->GetMinimumSizeForLabelText(
             GetToolbarModel()->GetEVCertName()).width();
   } else if (!origin_chip_view_->visible()) {
     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() ?
       (search_button_->GetMinimumSize().width() + kSearchButtonInset) :
       horizontal_edge_thickness;
   trailing_width += IncrementalMinimumWidth(star_view_) +
       IncrementalMinimumWidth(translate_icon_view_) +
       IncrementalMinimumWidth(open_pdf_in_reader_view_) +
       IncrementalMinimumWidth(manage_passwords_icon_view_) +
       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));
   for (ContentSettingViews::const_iterator i(content_setting_views_.begin());
        i != content_setting_views_.end(); ++i)
     trailing_width += IncrementalMinimumWidth((*i));
 
   min_size.set_width(
       leading_width + omnibox_view_->GetMinimumSize().width() + trailing_width);
   return min_size;
 }
 
 void LocationBarView::Layout() {
   if (!IsInitialized())
     return;
 
   origin_chip_view_->SetVisible(GetToolbarModel()->ShouldShowOriginChip());
   selected_keyword_view_->SetVisible(false);
   location_icon_view_->SetVisible(false);
   ev_bubble_view_->SetVisible(false);
   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();
   const int origin_chip_width =
       origin_chip_view_->visible() ? origin_chip_preferred_width : 0;
   // Always give the origin chip view its desired size and lay it out, even when
   // it's not visible, so we can calculate the correct animation values below
   // when switching to tabs that have the origin chip hidden.
   origin_chip_view_->SetBounds(0, 0, origin_chip_preferred_width, height());
   origin_chip_view_->Layout();
@@ skipping 1010 matching lines @@
 
 void LocationBarView::ModelChanged(const SearchModel::State& old_state,
                                    const SearchModel::State& new_state) {
   const bool visible = !GetToolbarModel()->input_in_progress() &&
       new_state.voice_search_supported;
   if (mic_search_view_->visible() != visible) {
     mic_search_view_->SetVisible(visible);
     Layout();
   }
 }