Delete panel metrics and define insets in terms of distance metrics.

ui/views/layout/layout_provider.h

 // Copyright 2017 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 UI_VIEWS_LAYOUT_LAYOUT_PROVIDER_H_
 #define UI_VIEWS_LAYOUT_LAYOUT_PROVIDER_H_
 
 #include "base/macros.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/views/style/typography_provider.h"
 #include "ui/views/views_export.h"
 
 namespace views {
 
 enum InsetsMetric {
   // Embedders can extend this enum with additional values that are understood
   // by the LayoutProvider implementation. Embedders define enum values from
   // VIEWS_INSETS_END. Values named beginning with "INSETS_" represent the
   // actual Insets: the rest are markers.
   VIEWS_INSETS_START = 0,
 
-  // The margins around the contents area of a bubble (popover)-style dialog.
+  // The margins around the contents of a bubble (popover)-style dialog.
   INSETS_BUBBLE_CONTENTS = VIEWS_INSETS_START,
-  // The margins around the title of a bubble (popover)-style dialog.
+  // The margins around the title of a bubble (popover)-style dialog. The bottom
+  // margin is implied by the content insets.
   INSETS_BUBBLE_TITLE,
-  // The margins around the button row of a dialog.
-  INSETS_DIALOG_BUTTON,
-  // The margins around the icon/title of a dialog.
+  // The margins around the button row of a dialog. The top margin is implied
+  // by the content insets.
+  INSETS_DIALOG_BUTTON_ROW,
+  // The margins that should be applied around the contents of a dialog.
+  INSETS_DIALOG_CONTENTS,
+  // The margins around the icon/title of a dialog. The bottom margin is implied
+  // by the content insets.
   INSETS_DIALOG_TITLE,
-  // The margins that should be applied around a panel GridLayout.
-  INSETS_PANEL,
   // Padding to add to vector image buttons to increase their click and touch
   // target size.
   INSETS_VECTOR_IMAGE_BUTTON,
 
   // Embedders must start Insets enum values from this value.
   VIEWS_INSETS_END,
 
   // All Insets enum values must be below this value.
   VIEWS_INSETS_MAX = 0x1000
 };
 
 enum DistanceMetric {
   // DistanceMetric enum values must always be greater than any InsetsMetric
   // value. This allows the code to verify at runtime that arguments of the
   // two types have not been interchanged.
   VIEWS_DISTANCE_START = VIEWS_INSETS_MAX,
 
+  // Margin on the left and right of the contents of a bubble.
+  DISTANCE_BUBBLE_CONTENTS_HORIZONTAL_MARGIN = VIEWS_DISTANCE_START,
+  // Margin on the top and bottom of the contents of a bubble.
+  DISTANCE_BUBBLE_CONTENTS_VERTICAL_MARGIN,
   // The default padding to add on each side of a button's label.
-  DISTANCE_BUTTON_HORIZONTAL_PADDING = VIEWS_DISTANCE_START,
+  DISTANCE_BUTTON_HORIZONTAL_PADDING,
   // The maximum width a button can have and still influence the sizes of
   // other linked buttons.  This allows short buttons to have linked widths
   // without long buttons making things overly wide.
   DISTANCE_BUTTON_MAX_LINKABLE_WIDTH,
   // The distance between a dialog's edge and the close button in the upper
   // trailing corner.
   DISTANCE_CLOSE_BUTTON_MARGIN,
+  // Margin between the bottom edge of a dialog and a contained button.
+  DISTANCE_DIALOG_BUTTON_BOTTOM_MARGIN,
   // The default minimum width of a dialog button.
   DISTANCE_DIALOG_BUTTON_MINIMUM_WIDTH,
+  // Margin on the left and right of the contents of a dialog.
+  DISTANCE_DIALOG_CONTENTS_HORIZONTAL_MARGIN,
+  // Margin on the top and bottom of the contents of a dialog.
+  DISTANCE_DIALOG_CONTENTS_VERTICAL_MARGIN,
   // The spacing between a pair of related horizontal buttons, used for
   // dialog layout.
   DISTANCE_RELATED_BUTTON_HORIZONTAL,
   // Horizontal spacing between controls that are logically related.
   DISTANCE_RELATED_CONTROL_HORIZONTAL,
   // The spacing between a pair of related vertical controls, used for
   // dialog layout.
   DISTANCE_RELATED_CONTROL_VERTICAL,
 
   // Embedders must start DistanceMetric enum values from here.
@@ skipping 25 matching lines @@
 
  private:
   DefaultTypographyProvider typography_provider_;
 
   DISALLOW_COPY_AND_ASSIGN(LayoutProvider);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_LAYOUT_LAYOUT_PROVIDER_H_