Remove IconLabelView layout constants.

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 39 matching lines @@
 TabKeyBubbleView::TabKeyBubbleView()
     : views::Label(l10n_util::GetStringUTF16(IDS_APP_TAB_KEY)) {
   SetBorder(views::Border::CreateEmptyBorder(
       gfx::Insets(GetLayoutConstant(LOCATION_BAR_BUBBLE_VERTICAL_PADDING), 0)));
 }
 
 TabKeyBubbleView::~TabKeyBubbleView() {}
 
 gfx::Size TabKeyBubbleView::GetPreferredSize() const {
   gfx::Size size = views::Label::GetPreferredSize();
-  size.Enlarge(2 * GetLayoutConstant(ICON_LABEL_VIEW_TRAILING_PADDING), 0);
+  constexpr int kPaddingInsideBorder = 5;
+  // Even though the border is 1 px thick visibly, it takes 1 DIP logically.
+  size.Enlarge(2 * (kPaddingInsideBorder + 1), 0);
   return size;
 }
 
 }  // namespace
 
 KeywordHintView::KeywordHintView(Profile* profile,
                                  const gfx::FontList& font_list,
                                  const gfx::FontList& bubble_font_list,
                                  int bubble_height,
                                  SkColor text_color,
@@ skipping 89 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;
 }