Remove references to ui/views/layout/layout_constants.h

ui/views/layout/layout_provider.cc

 // Copyright 2017 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 "ui/views/layout/layout_provider.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "ui/base/material_design/material_design_controller.h"
-#include "ui/views/layout/layout_constants.h"
 #include "ui/views/views_delegate.h"
 
 namespace views {
 
 namespace {
+
 LayoutProvider* g_layout_delegate = nullptr;
-}
+
+}  // namespace
 
 LayoutProvider::LayoutProvider() {
   g_layout_delegate = this;
 }
 
 LayoutProvider::~LayoutProvider() {
   if (this == g_layout_delegate)
     g_layout_delegate = nullptr;
 }
 
@@ skipping 27 matching lines @@
       return gfx::Insets(
           GetDistanceMetric(DISTANCE_DIALOG_CONTENTS_VERTICAL_MARGIN),
           GetDistanceMetric(DISTANCE_DIALOG_CONTENTS_HORIZONTAL_MARGIN));
     case InsetsMetric::INSETS_DIALOG_TITLE: {
       const gfx::Insets dialog_contents =
           GetInsetsMetric(INSETS_DIALOG_CONTENTS);
       return gfx::Insets(dialog_contents.top(), dialog_contents.left(), 0,
                          dialog_contents.right());
     }
     case InsetsMetric::INSETS_VECTOR_IMAGE_BUTTON:
-      return gfx::Insets(kVectorButtonExtraTouchSize);
+      return gfx::Insets(4);
   }
   NOTREACHED();
   return gfx::Insets();
 }
 
 int LayoutProvider::GetDistanceMetric(int metric) const {
   DCHECK_GE(metric, VIEWS_INSETS_MAX);
   switch (metric) {
     case DISTANCE_BUBBLE_CONTENTS_HORIZONTAL_MARGIN:
-      return kPanelHorizMargin;
+      return 13;
     case DISTANCE_BUBBLE_CONTENTS_VERTICAL_MARGIN:
     case DISTANCE_DIALOG_CONTENTS_VERTICAL_MARGIN:
-      return kPanelVertMargin;
+      return 13;
     case DistanceMetric::DISTANCE_BUTTON_HORIZONTAL_PADDING:
-      return kButtonHorizontalPadding;
+      return 16;
     case DistanceMetric::DISTANCE_BUTTON_MAX_LINKABLE_WIDTH:
       return 0;
     case DistanceMetric::DISTANCE_CLOSE_BUTTON_MARGIN:
-      return kCloseButtonMargin;
+      return 7;
     case DistanceMetric::DISTANCE_RELATED_BUTTON_HORIZONTAL:
-      return kRelatedButtonHSpacing;
+      return 6;
     case DistanceMetric::DISTANCE_RELATED_CONTROL_HORIZONTAL:
-      return kRelatedControlHorizontalSpacing;
+      return 8;
     case DistanceMetric::DISTANCE_BUBBLE_BUTTON_TOP_MARGIN:
     case DistanceMetric::DISTANCE_RELATED_CONTROL_VERTICAL:
-      return kRelatedControlVerticalSpacing;
+      return 8;
     case DISTANCE_DIALOG_BUTTON_BOTTOM_MARGIN:
-      return views::kButtonVEdgeMarginNew;
+      return 20;
     case DistanceMetric::DISTANCE_DIALOG_BUTTON_MINIMUM_WIDTH:
-      return kDialogMinimumButtonWidth;
+      return 75;
     case DISTANCE_DIALOG_CONTENTS_HORIZONTAL_MARGIN:
-      return kButtonHEdgeMarginNew;
+      return 20;
     case DISTANCE_UNRELATED_CONTROL_VERTICAL:
-      return kUnrelatedControlVerticalSpacing;
+      return 20;
   }
   NOTREACHED();
   return 0;
 }
 
 const TypographyProvider& LayoutProvider::GetTypographyProvider() const {
   return typography_provider_;
 }
 
 int LayoutProvider::GetSnappedDialogWidth(int min_width) const {
   // This is an arbitrary value, but it's a good arbitrary value. Some dialogs
   // have very small widths for their contents views, which causes ugly
   // title-wrapping where a two-word title is split across multiple lines or
   // similar. To prevent that, forbid any snappable dialog from being narrower
   // than this value. In principle it's possible to factor in the title width
   // here, but it is not really worth the complexity.
   return std::max(min_width, 320);
 }
 
 }  // namespace views