Implement ChromeViewsDelegate methods in terms of LayoutDelegate where possible.

chrome/browser/ui/views/chrome_views_delegate.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/chrome_views_delegate.h"
 
 #include <memory>
 
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 523 matching lines @@
   base::AutoReset<bool> in_callback_setter(&in_autohide_edges_callback_, true);
   callback.Run();
 }
 #endif
 
 scoped_refptr<base::TaskRunner>
 ChromeViewsDelegate::GetBlockingPoolTaskRunner() {
   return content::BrowserThread::GetBlockingPool();
 }
 
-gfx::Insets ChromeViewsDelegate::GetDialogButtonInsets() {
-  if (ui::MaterialDesignController::IsSecondaryUiMaterial())
-    return gfx::Insets(HarmonyLayoutDelegate::kHarmonyLayoutUnit);
-  return ViewsDelegate::GetDialogButtonInsets();
+gfx::Insets ChromeViewsDelegate::GetDialogButtonInsets() const {
+  return gfx::Insets(LayoutDelegate::Get()->GetMetric(
+      LayoutDelegate::Metric::DIALOG_BUTTON_MARGIN));
 }
 
-int ChromeViewsDelegate::GetDialogRelatedButtonHorizontalSpacing() {
-  if (ui::MaterialDesignController::IsSecondaryUiMaterial())
-    return HarmonyLayoutDelegate::kHarmonyLayoutUnit / 2;
-  return ViewsDelegate::GetDialogRelatedButtonHorizontalSpacing();
+int ChromeViewsDelegate::GetDialogRelatedButtonHorizontalSpacing() const {
+  return LayoutDelegate::Get()->GetMetric(
+      LayoutDelegate::Metric::RELATED_BUTTON_HORIZONTAL_SPACING);

[sky, 2017/02/01 16:29:01]

I'm assuming all these calls result in the same values.

[Peter Kasting, 2017/02/01 19:58:43]

They should, if I did my cross-checking correctly.

 }
 
-int ChromeViewsDelegate::GetDialogRelatedControlVerticalSpacing() {
-  if (ui::MaterialDesignController::IsSecondaryUiMaterial())
-    return HarmonyLayoutDelegate::kHarmonyLayoutUnit / 2;
-  return ViewsDelegate::GetDialogRelatedControlVerticalSpacing();
+int ChromeViewsDelegate::GetDialogRelatedControlVerticalSpacing() const {
+  return LayoutDelegate::Get()->GetMetric(
+      LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING);
 }
 
-gfx::Insets ChromeViewsDelegate::GetDialogFrameViewInsets() {
-  if (ui::MaterialDesignController::IsSecondaryUiMaterial())
-    // Titles are inset at the top and sides, but not at the bottom.
-    return gfx::Insets(HarmonyLayoutDelegate::kHarmonyLayoutUnit,
-                       HarmonyLayoutDelegate::kHarmonyLayoutUnit, 0,
-                       HarmonyLayoutDelegate::kHarmonyLayoutUnit);
-  return ViewsDelegate::GetDialogFrameViewInsets();
+gfx::Insets ChromeViewsDelegate::GetDialogFrameViewInsets() const {
+  const LayoutDelegate* layout_delegate = LayoutDelegate::Get();
+  const int top = layout_delegate->GetMetric(
+      LayoutDelegate::Metric::PANEL_CONTENT_MARGIN);
+  const int side = layout_delegate->GetMetric(
+      LayoutDelegate::Metric::DIALOG_BUTTON_MARGIN);
+  // Titles are inset at the top and sides, but not at the bottom.
+  return gfx::Insets(top, side, 0, side);
 }
 
-gfx::Insets ChromeViewsDelegate::GetBubbleDialogMargins() {
-  if (ui::MaterialDesignController::IsSecondaryUiMaterial())
-    return gfx::Insets(HarmonyLayoutDelegate::kHarmonyLayoutUnit);
-  return ViewsDelegate::GetBubbleDialogMargins();
+gfx::Insets ChromeViewsDelegate::GetBubbleDialogMargins() const {
+  return gfx::Insets(LayoutDelegate::Get()->GetMetric(
+      LayoutDelegate::Metric::PANEL_CONTENT_MARGIN));
 }
 
 #if !defined(USE_ASH)
 views::Widget::InitParams::WindowOpacity
 ChromeViewsDelegate::GetOpacityForInitParams(
     const views::Widget::InitParams& params) {
   return views::Widget::InitParams::OPAQUE_WINDOW;
 }
 #endif