| Index: chrome/browser/ui/views/harmony/harmony_layout_delegate.cc
|
| diff --git a/chrome/browser/ui/views/harmony/harmony_layout_delegate.cc b/chrome/browser/ui/views/harmony/harmony_layout_delegate.cc
|
| index d3eaa40902ad20d5de1aa1e8b8d5207773d53337..40d0417d095cc503a3bf3951f2dc1a55487847c4 100644
|
| --- a/chrome/browser/ui/views/harmony/harmony_layout_delegate.cc
|
| +++ b/chrome/browser/ui/views/harmony/harmony_layout_delegate.cc
|
| @@ -17,9 +17,9 @@ HarmonyLayoutDelegate* HarmonyLayoutDelegate::Get() {
|
|
|
| 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;
|
| @@ -27,16 +27,12 @@ int HarmonyLayoutDelegate::GetLayoutDistance(LayoutDistanceType type) const {
|
| 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:
|
| - return kHarmonyLayoutUnit;
|
| - case LayoutDistanceType::BUTTON_VEDGE_MARGIN_NEW:
|
| + case LayoutDistanceType::UNRELATED_CONTROL_VERTICAL_SPACING_LARGE:
|
| return kHarmonyLayoutUnit;
|
| - case LayoutDistanceType::BUTTON_HEDGE_MARGIN_NEW:
|
| - return kHarmonyLayoutUnit;
|
| - case LayoutDistanceType::CHECKBOX_INDENT:
|
| - return 0;
|
| }
|
| NOTREACHED();
|
| return 0;
|
|
|