Broke out layout metric information from ViewsDelegate to LayoutProvider

chrome/browser/ui/views/harmony/layout_delegate.cc

Index: chrome/browser/ui/views/harmony/layout_delegate.cc
diff --git a/chrome/browser/ui/views/harmony/layout_delegate.cc b/chrome/browser/ui/views/harmony/layout_delegate.cc
deleted file mode 100644
index 71d07217a31af4922fa746104a07be689f7cbf0a..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/views/harmony/layout_delegate.cc
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2016 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/layout_delegate.h"
-
-#include "base/lazy_instance.h"
-#include "base/logging.h"
-#include "chrome/browser/ui/views/chrome_views_delegate.h"
-#include "chrome/browser/ui/views/harmony/chrome_typography.h"
-#include "chrome/browser/ui/views/harmony/harmony_layout_delegate.h"
-#include "ui/base/material_design/material_design_controller.h"
-#include "ui/views/layout/layout_constants.h"
-
-static base::LazyInstance<LayoutDelegate>::DestructorAtExit layout_delegate_ =
-    LAZY_INSTANCE_INITIALIZER;
-
-// static
-LayoutDelegate* LayoutDelegate::Get() {
-  return ui::MaterialDesignController::IsSecondaryUiMaterial()
-             ? HarmonyLayoutDelegate::Get()
-             : layout_delegate_.Pointer();
-}
-
-int LayoutDelegate::GetMetric(Metric metric) const {
-  switch (metric) {
-    case Metric::BUTTON_HORIZONTAL_PADDING:
-      return ChromeViewsDelegate::GetDefaultDistanceMetric(
-          views::DistanceMetric::BUTTON_HORIZONTAL_PADDING);
-    case Metric::BUTTON_MAX_LINKABLE_WIDTH:
-      return 0;  // Buttons never expand during layout (add padding instead).
-    case Metric::BUTTON_MINIMUM_WIDTH:
-      return views::kMinimumButtonWidth;
-    case Metric::DIALOG_BUTTON_MARGIN:
-      return views::kButtonHEdgeMarginNew;
-    case Metric::DIALOG_BUTTON_MINIMUM_WIDTH:
-      return ChromeViewsDelegate::GetDefaultDistanceMetric(
-          views::DistanceMetric::DIALOG_BUTTON_MINIMUM_WIDTH);
-    case Metric::DIALOG_BUTTON_TOP_SPACING:
-      return 0;
-    case Metric::DIALOG_CLOSE_BUTTON_MARGIN:
-      return ChromeViewsDelegate::GetDefaultDistanceMetric(
-          views::DistanceMetric::CLOSE_BUTTON_MARGIN);
-    case Metric::PANEL_CONTENT_MARGIN:
-      return views::kPanelHorizMargin;
-    case Metric::RELATED_BUTTON_HORIZONTAL_SPACING:
-      return ChromeViewsDelegate::GetDefaultDistanceMetric(
-          views::DistanceMetric::RELATED_BUTTON_HORIZONTAL);
-    case Metric::RELATED_CONTROL_HORIZONTAL_SPACING:
-      return ChromeViewsDelegate::GetDefaultDistanceMetric(
-          views::DistanceMetric::RELATED_CONTROL_HORIZONTAL);
-    case Metric::RELATED_CONTROL_HORIZONTAL_SPACING_SMALL:
-      return views::kRelatedControlSmallVerticalSpacing;
-    case Metric::RELATED_CONTROL_VERTICAL_SPACING:
-      return ChromeViewsDelegate::GetDefaultDistanceMetric(
-          views::DistanceMetric::RELATED_CONTROL_VERTICAL);
-    case Metric::RELATED_CONTROL_VERTICAL_SPACING_SMALL:
-      return views::kRelatedControlSmallVerticalSpacing;
-    case Metric::RELATED_LABEL_HORIZONTAL_SPACING:
-      return views::kItemLabelSpacing;
-    case Metric::SUBSECTION_HORIZONTAL_INDENT:
-      return views::kCheckboxIndent;
-    case Metric::UNRELATED_CONTROL_HORIZONTAL_SPACING:
-      return views::kUnrelatedControlHorizontalSpacing;
-    case Metric::UNRELATED_CONTROL_HORIZONTAL_SPACING_LARGE:
-      return views::kUnrelatedControlLargeHorizontalSpacing;
-    case Metric::UNRELATED_CONTROL_VERTICAL_SPACING:
-      return views::kUnrelatedControlVerticalSpacing;
-    case Metric::UNRELATED_CONTROL_VERTICAL_SPACING_LARGE:
-      return views::kUnrelatedControlLargeVerticalSpacing;
-    case Metric::VECTOR_IMAGE_BUTTON_PADDING:
-      return views::kVectorButtonExtraTouchSize;
-  }
-  NOTREACHED();
-  return 0;
-}
-
-views::GridLayout::Alignment LayoutDelegate::GetControlLabelGridAlignment()
-    const {
-  return views::GridLayout::TRAILING;
-}
-
-bool LayoutDelegate::UseExtraDialogPadding() const {
-  return true;
-}
-
-bool LayoutDelegate::ShouldShowWindowIcon() const {
-  return true;
-}
-
-bool LayoutDelegate::IsHarmonyMode() const {
-  return false;
-}
-
-int LayoutDelegate::GetDialogPreferredWidth(DialogWidth width) const {
-  return 0;
-}
-
-const views::TypographyProvider& LayoutDelegate::GetTypographyProvider() const {
-  // This is not a data member because then HarmonyLayoutDelegate would inherit
-  // it, even when it provides its own.
-  CR_DEFINE_STATIC_LOCAL(LegacyTypographyProvider, legacy_provider, ());
-  return legacy_provider;
-}