| Index: ash/common/system/date/date_view.cc
|
| diff --git a/ash/common/system/date/date_view.cc b/ash/common/system/date/date_view.cc
|
| index a0857961479db123f0c009653b561ec4dada5193..6f9d12a45820cb2b4953fb458524ec17b75afa25 100644
|
| --- a/ash/common/system/date/date_view.cc
|
| +++ b/ash/common/system/date/date_view.cc
|
| @@ -372,11 +372,11 @@ void TimeView::SetBorderFromLayout(ClockLayout clock_layout) {
|
| return;
|
|
|
| if (clock_layout == ClockLayout::HORIZONTAL_CLOCK) {
|
| - SetBorder(views::Border::CreateEmptyBorder(
|
| + SetBorder(views::CreateEmptyBorder(
|
| 0, kTrayLabelItemHorizontalPaddingBottomAlignment, 0,
|
| kTrayLabelItemHorizontalPaddingBottomAlignment));
|
| } else {
|
| - SetBorder(views::Border::NullBorder());
|
| + SetBorder(views::NullBorder());
|
| }
|
| }
|
|
|
| @@ -390,11 +390,11 @@ void TimeView::SetupLabels() {
|
| // TODO(estade): this should use the NativeTheme's secondary text color.
|
| vertical_label_minutes_->SetEnabledColor(kVerticalClockMinuteColor);
|
| // Pull the minutes up closer to the hours by using a negative top border.
|
| - vertical_label_minutes_->SetBorder(views::Border::CreateEmptyBorder(
|
| - MaterialDesignController::IsShelfMaterial()
|
| - ? kVerticalClockMinutesTopOffsetMD
|
| - : kVerticalClockMinutesTopOffset,
|
| - 0, 0, 0));
|
| + vertical_label_minutes_->SetBorder(
|
| + views::CreateEmptyBorder(MaterialDesignController::IsShelfMaterial()
|
| + ? kVerticalClockMinutesTopOffsetMD
|
| + : kVerticalClockMinutesTopOffset,
|
| + 0, 0, 0));
|
| }
|
|
|
| void TimeView::SetupLabel(views::Label* label) {
|
|
|