Last round of cleaning up MD 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>
 
 #include "base/macros.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/location_bar/background_with_1_px_border.h"
+#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/search_engines/template_url_service.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 
 namespace {
 
 // This view sort of looks like a tab key.
 class TabKeyBubbleView : public views::Label {
  public:
   explicit TabKeyBubbleView(const gfx::FontList& font_list);
   ~TabKeyBubbleView() override;
 
  private:
   // views::Label:
   gfx::Size GetPreferredSize() const override;
 
   DISALLOW_COPY_AND_ASSIGN(TabKeyBubbleView);
 };
 
 TabKeyBubbleView::TabKeyBubbleView(const gfx::FontList& font_list)
     : views::Label(l10n_util::GetStringUTF16(IDS_APP_TAB_KEY), font_list) {
   SetBorder(views::CreateEmptyBorder(
-      gfx::Insets(GetLayoutConstant(LOCATION_BAR_BUBBLE_VERTICAL_PADDING), 0)));
+      gfx::Insets(LocationBarView::kBubbleVerticalPadding, 0)));
 }
 
 TabKeyBubbleView::~TabKeyBubbleView() {}
 
 gfx::Size TabKeyBubbleView::GetPreferredSize() const {
   gfx::Size size = views::Label::GetPreferredSize();
   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;
@@ 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;
 }