Rename various LayoutDelegate types/functions for brevity and consistency.

chrome/browser/ui/views/harmony/harmony_layout_delegate.h

Index: chrome/browser/ui/views/harmony/harmony_layout_delegate.h
diff --git a/chrome/browser/ui/views/harmony/harmony_layout_delegate.h b/chrome/browser/ui/views/harmony/harmony_layout_delegate.h
index 61b2aa0f7922057d509fad163b9ad1521f0c71a2..4f478dbb6c6c6e7fb402d836bf2e31a81854725b 100644
--- a/chrome/browser/ui/views/harmony/harmony_layout_delegate.h
+++ b/chrome/browser/ui/views/harmony/harmony_layout_delegate.h
@@ -10,7 +10,7 @@
 class HarmonyLayoutDelegate : public LayoutDelegate {
  public:
   // The Harmony layout unit. All distances are in terms of this unit.
-  static const int kHarmonyLayoutUnit = 16;
+  static constexpr int kHarmonyLayoutUnit = 16;
 
   HarmonyLayoutDelegate() {}
   ~HarmonyLayoutDelegate() override {}
@@ -19,11 +19,11 @@ class HarmonyLayoutDelegate : public LayoutDelegate {
   static HarmonyLayoutDelegate* Get();
 
   // views::LayoutDelegate:
-  int GetLayoutDistance(LayoutDistanceType type) const override;
+  int GetMetric(Metric metric) const override;
   views::GridLayout::Alignment GetControlLabelGridAlignment() const override;
   bool UseExtraDialogPadding() const override;
   bool IsHarmonyMode() const override;
-  int GetDialogPreferredWidth(DialogWidthType type) const override;
+  int GetDialogPreferredWidth(DialogWidth width) const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HarmonyLayoutDelegate);