| Index: ui/views/layout/layout_constants.h
|
| diff --git a/ui/views/layout/layout_constants.h b/ui/views/layout/layout_constants.h
|
| index 41060ef721ad8880f0405490a5f87b5f493e8421..798a4401cbcb8cb825a5253737c29acfab57693a 100644
|
| --- a/ui/views/layout/layout_constants.h
|
| +++ b/ui/views/layout/layout_constants.h
|
| @@ -15,70 +15,70 @@
|
| namespace views {
|
|
|
| // Left or right margin.
|
| -const int kPanelHorizMargin = 13;
|
| +constexpr int kPanelHorizMargin = 13;
|
|
|
| // Top or bottom margin.
|
| -const int kPanelVertMargin = 13;
|
| +constexpr int kPanelVertMargin = 13;
|
|
|
| // When several controls are aligned vertically, the baseline should be spaced
|
| // by the following number of pixels.
|
| -const int kPanelVerticalSpacing = 32;
|
| +constexpr int kPanelVerticalSpacing = 32;
|
|
|
| // Vertical spacing between sub UI.
|
| -const int kPanelSubVerticalSpacing = 24;
|
| +constexpr int kPanelSubVerticalSpacing = 24;
|
|
|
| // Vertical spacing between a label and some control.
|
| -const int kLabelToControlVerticalSpacing = 8;
|
| +constexpr int kLabelToControlVerticalSpacing = 8;
|
|
|
| // Small horizontal spacing between controls that are logically related.
|
| -const int kRelatedControlSmallHorizontalSpacing = 8;
|
| +constexpr int kRelatedControlSmallHorizontalSpacing = 8;
|
|
|
| // Horizontal spacing between controls that are logically related.
|
| -const int kRelatedControlHorizontalSpacing = 8;
|
| +constexpr int kRelatedControlHorizontalSpacing = 8;
|
|
|
| // Vertical spacing between controls that are logically related.
|
| -const int kRelatedControlVerticalSpacing = 8;
|
| +constexpr int kRelatedControlVerticalSpacing = 8;
|
|
|
| // Small vertical spacing between controls that are logically related.
|
| -const int kRelatedControlSmallVerticalSpacing = 4;
|
| +constexpr int kRelatedControlSmallVerticalSpacing = 4;
|
|
|
| // Horizontal spacing between controls that are logically unrelated.
|
| -const int kUnrelatedControlHorizontalSpacing = 12;
|
| +constexpr int kUnrelatedControlHorizontalSpacing = 12;
|
|
|
| // Larger horizontal spacing between unrelated controls.
|
| -const int kUnrelatedControlLargeHorizontalSpacing = 20;
|
| +constexpr int kUnrelatedControlLargeHorizontalSpacing = 20;
|
|
|
| // Vertical spacing between controls that are logically unrelated.
|
| -const int kUnrelatedControlVerticalSpacing = 20;
|
| +constexpr int kUnrelatedControlVerticalSpacing = 20;
|
|
|
| // Larger vertical spacing between unrelated controls.
|
| -const int kUnrelatedControlLargeVerticalSpacing = 30;
|
| +constexpr int kUnrelatedControlLargeVerticalSpacing = 30;
|
|
|
| // Vertical spacing between the edge of the window and the
|
| // top or bottom of a button.
|
| -const int kButtonVEdgeMargin = 9;
|
| +constexpr int kButtonVEdgeMargin = 9;
|
|
|
| // Horizontal spacing between the edge of the window and the
|
| // left or right of a button.
|
| -const int kButtonHEdgeMargin = 13;
|
| +constexpr int kButtonHEdgeMargin = 13;
|
|
|
| // Vertical spacing between the edge of the window and the
|
| // top or bottom of a button (when using new style dialogs).
|
| -const int kButtonVEdgeMarginNew = 20;
|
| +constexpr int kButtonVEdgeMarginNew = 20;
|
|
|
| // Horizontal spacing between the edge of the window and the
|
| // left or right of a button (when using new style dialogs).
|
| -const int kButtonHEdgeMarginNew = 20;
|
| +constexpr int kButtonHEdgeMarginNew = 20;
|
|
|
| // Horizontal spacing between buttons that are logically related.
|
| -const int kRelatedButtonHSpacing = 6;
|
| +constexpr int kRelatedButtonHSpacing = 6;
|
|
|
| // Indent of checkboxes relative to related text.
|
| -const int kCheckboxIndent = 10;
|
| +constexpr int kCheckboxIndent = 10;
|
|
|
| // Horizontal spacing between the end of an item (i.e. an icon or a checkbox)
|
| // and the start of its corresponding text.
|
| -const int kItemLabelSpacing = 10;
|
| +constexpr int kItemLabelSpacing = 10;
|
|
|
| } // namespace views
|
|
|
|
|