Try to rename LayoutDistanceType enum values for clarity and consistency.

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

 // 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/harmony_layout_delegate.h"
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 
 static base::LazyInstance<HarmonyLayoutDelegate> harmony_layout_delegate_ =
     LAZY_INSTANCE_INITIALIZER;
 
 // static
 HarmonyLayoutDelegate* HarmonyLayoutDelegate::Get() {
   return harmony_layout_delegate_.Pointer();
 }
 
 int HarmonyLayoutDelegate::GetLayoutDistance(LayoutDistanceType type) const {
   switch (type) {
-    case LayoutDistanceType::PANEL_HORIZ_MARGIN:
+    case LayoutDistanceType::DIALOG_BUTTON_MARGIN:
       return kHarmonyLayoutUnit;
-    case LayoutDistanceType::PANEL_VERT_MARGIN:
+    case LayoutDistanceType::PANEL_CONTENT_MARGIN:
       return kHarmonyLayoutUnit;
     case LayoutDistanceType::RELATED_BUTTON_HORIZONTAL_SPACING:
       return kHarmonyLayoutUnit / 2;
     case LayoutDistanceType::RELATED_CONTROL_HORIZONTAL_SPACING:
       return kHarmonyLayoutUnit;
     case LayoutDistanceType::RELATED_CONTROL_VERTICAL_SPACING:
       return kHarmonyLayoutUnit / 2;
+    case LayoutDistanceType::SUBSECTION_HORIZONTAL_INDENT:
+      return 0;
     case LayoutDistanceType::UNRELATED_CONTROL_VERTICAL_SPACING:
       return kHarmonyLayoutUnit;
-    case LayoutDistanceType::UNRELATED_CONTROL_LARGE_VERTICAL_SPACING:
+    case LayoutDistanceType::UNRELATED_CONTROL_VERTICAL_SPACING_LARGE:
       return kHarmonyLayoutUnit;
-    case LayoutDistanceType::BUTTON_VEDGE_MARGIN_NEW:
-      return kHarmonyLayoutUnit;
-    case LayoutDistanceType::BUTTON_HEDGE_MARGIN_NEW:
-      return kHarmonyLayoutUnit;
-    case LayoutDistanceType::CHECKBOX_INDENT:
-      return 0;
   }
   NOTREACHED();
   return 0;
 }
 
 views::GridLayout::Alignment
 HarmonyLayoutDelegate::GetControlLabelGridAlignment() const {
   return views::GridLayout::LEADING;
 }
 
@@ skipping 10 matching lines @@
     case DialogWidthType::SMALL:
       return 320;
     case DialogWidthType::MEDIUM:
       return 448;
     case DialogWidthType::LARGE:
       return 512;
   }
   NOTREACHED();
   return 0;
 }