Rename various LayoutDelegate types/functions for brevity and consistency.

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_HARMONY_HARMONY_LAYOUT_DELEGATE_H_
 #define CHROME_BROWSER_UI_VIEWS_HARMONY_HARMONY_LAYOUT_DELEGATE_H_
 
 #include "chrome/browser/ui/views/harmony/layout_delegate.h"
 
 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 {}
 
   // Returns the singleton HarmonyLayoutDelegate instance.
   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);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_HARMONY_HARMONY_LAYOUT_DELEGATE_H_