Adjust positioning of location bar icons.

chrome/browser/ui/views/location_bar/keyword_hint_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/keyword_hint_view.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 95 matching lines @@
   DCHECK_EQ(2U, content_param_offsets.size());
   leading_label_->SetText(
       keyword_hint.substr(0, content_param_offsets.front()));
   trailing_label_->SetText(keyword_hint.substr(content_param_offsets.front()));
 }
 
 gfx::Size KeywordHintView::GetPreferredSize() const {
   // Height will be ignored by the LocationBarView.
   return gfx::Size(leading_label_->GetPreferredSize().width() +
                        tab_key_view_->GetPreferredSize().width() +
-                       trailing_label_->GetPreferredSize().width(),
+                       trailing_label_->GetPreferredSize().width() +
+                       LocationBarView::kIconInteriorPadding,
                    0);
 }
 
 gfx::Size KeywordHintView::GetMinimumSize() const {
   // Height will be ignored by the LocationBarView.
   return tab_key_view_->GetPreferredSize();
 }
 
 void KeywordHintView::Layout() {
   int tab_width = tab_key_view_->GetPreferredSize().width();
@@ skipping 15 matching lines @@
 
 views::Label* KeywordHintView::CreateLabel(const gfx::FontList& font_list,
                                            SkColor text_color,
                                            SkColor background_color) {
   views::Label* label = new views::Label(base::string16(), font_list);
   label->SetEnabledColor(text_color);
   label->SetBackgroundColor(background_color);
   AddChildView(label);
   return label;
 }