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

chrome/browser/ui/views/harmony/chrome_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 "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/ui/views/harmony/chrome_typography.h"
 #include "chrome/browser/ui/views/harmony/harmony_layout_provider.h"
 #include "ui/base/material_design/material_design_controller.h"
-#include "ui/views/layout/layout_constants.h"
+
+namespace {
+
+// Default minimum width of buttons.
+constexpr int kMinimumButtonWidth = 48;

[Peter Kasting, 2017/06/13 23:33:35]

I would inline these directly into their single uses below.

I like named constants, but the whole point of this file is basically to return
some named-by-enum constants.  Those enum values are already commented
elsewhere.  So the additional names and comments here aren't really adding
clarity IMO.

[ananta, 2017/06/14 18:48:11]

Done.

+
+// Small horizontal spacing between controls that are logically related.
+constexpr int kRelatedControlSmallHorizontalSpacing = 8;
+
+// Small vertical spacing between controls that are logically related.
+constexpr int kRelatedControlSmallVerticalSpacing = 4;
+
+// Horizontal spacing between controls that are logically unrelated.
+constexpr int kUnrelatedControlHorizontalSpacing = 12;
+
+// Larger horizontal spacing between unrelated controls.
+constexpr int kUnrelatedControlLargeHorizontalSpacing = 20;
+
+// Larger vertical spacing between unrelated controls.
+constexpr int kUnrelatedControlLargeVerticalSpacing = 30;
+
+// Horizontal spacing between the end of an item (i.e. an icon or a checkbox)
+// and the start of its corresponding text.
+constexpr int kItemLabelSpacing = 10;
+
+// Indent of checkboxes relative to related text.
+constexpr int kCheckboxIndent = 10;
+
+}  // namespace
 
 // static
 ChromeLayoutProvider* ChromeLayoutProvider::Get() {
   return static_cast<ChromeLayoutProvider*>(views::LayoutProvider::Get());
 }
 
 // static
 std::unique_ptr<views::LayoutProvider>
 ChromeLayoutProvider::CreateLayoutProvider() {
   return ui::MaterialDesignController::IsSecondaryUiMaterial()
              ? base::MakeUnique<HarmonyLayoutProvider>()
              : base::MakeUnique<ChromeLayoutProvider>();
 }
 
 int ChromeLayoutProvider::GetDistanceMetric(int metric) const {
   switch (metric) {
     case DISTANCE_BUTTON_MINIMUM_WIDTH:
-      return views::kMinimumButtonWidth;
+      return kMinimumButtonWidth;
     case DISTANCE_CONTROL_LIST_VERTICAL:
       return GetDistanceMetric(views::DISTANCE_UNRELATED_CONTROL_VERTICAL);
     case DISTANCE_DIALOG_BUTTON_TOP:
       return 0;
     case DISTANCE_RELATED_CONTROL_HORIZONTAL_SMALL:
-      return views::kRelatedControlSmallHorizontalSpacing;
+      return kRelatedControlSmallHorizontalSpacing;
     case DISTANCE_RELATED_CONTROL_VERTICAL_SMALL:
-      return views::kRelatedControlSmallVerticalSpacing;
+      return kRelatedControlSmallVerticalSpacing;
     case DISTANCE_RELATED_LABEL_HORIZONTAL:
-      return views::kItemLabelSpacing;
+      return kItemLabelSpacing;
     case DISTANCE_SUBSECTION_HORIZONTAL_INDENT:
-      return views::kCheckboxIndent;
+      return kCheckboxIndent;
     case DISTANCE_UNRELATED_CONTROL_HORIZONTAL:
-      return views::kUnrelatedControlHorizontalSpacing;
+      return kUnrelatedControlHorizontalSpacing;
     case DISTANCE_UNRELATED_CONTROL_HORIZONTAL_LARGE:
-      return views::kUnrelatedControlLargeHorizontalSpacing;
+      return kUnrelatedControlLargeHorizontalSpacing;
     case DISTANCE_UNRELATED_CONTROL_VERTICAL_LARGE:
-      return views::kUnrelatedControlLargeVerticalSpacing;
+      return kUnrelatedControlLargeVerticalSpacing;
     default:
       return views::LayoutProvider::GetDistanceMetric(metric);
   }
 }
 
 const views::TypographyProvider& ChromeLayoutProvider::GetTypographyProvider()
     const {
   // This is not a data member because then HarmonyLayoutProvider would inherit
   // it, even when it provides its own.
   CR_DEFINE_STATIC_LOCAL(LegacyTypographyProvider, legacy_provider, ());
   return legacy_provider;
 }
 
 views::GridLayout::Alignment
 ChromeLayoutProvider::GetControlLabelGridAlignment() const {
   return views::GridLayout::TRAILING;
 }
 
 bool ChromeLayoutProvider::UseExtraDialogPadding() const {
   return true;
 }
 
 bool ChromeLayoutProvider::ShouldShowWindowIcon() const {
   return true;
 }
 
 bool ChromeLayoutProvider::IsHarmonyMode() const {
   return false;
 }