OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/system/date/date_view.h" | 5 #include "ash/system/date/date_view.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/system/tray/system_tray_delegate.h" | 8 #include "ash/system/tray/system_tray_delegate.h" |
9 #include "ash/system/tray/tray_constants.h" | 9 #include "ash/system/tray/tray_constants.h" |
10 #include "ash/system/tray/tray_utils.h" | 10 #include "ash/system/tray/tray_utils.h" |
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
294 SetupLabel(vertical_label_minutes_.get()); | 294 SetupLabel(vertical_label_minutes_.get()); |
295 vertical_label_minutes_->SetEnabledColor(kVerticalClockMinuteColor); | 295 vertical_label_minutes_->SetEnabledColor(kVerticalClockMinuteColor); |
296 // Pull the minutes up closer to the hours by using a negative top border. | 296 // Pull the minutes up closer to the hours by using a negative top border. |
297 vertical_label_minutes_->SetBorder(views::Border::CreateEmptyBorder( | 297 vertical_label_minutes_->SetBorder(views::Border::CreateEmptyBorder( |
298 kVerticalClockMinutesTopOffset, 0, 0, 0)); | 298 kVerticalClockMinutesTopOffset, 0, 0, 0)); |
299 } | 299 } |
300 | 300 |
301 void TimeView::SetupLabel(views::Label* label) { | 301 void TimeView::SetupLabel(views::Label* label) { |
302 label->set_owned_by_client(); | 302 label->set_owned_by_client(); |
303 SetupLabelForTray(label); | 303 SetupLabelForTray(label); |
304 label->SetFontList(label->font_list().DeriveFontListWithSizeDeltaAndStyle( | 304 label->SetFontList(label->font_list().DeriveWithStyle( |
305 0, label->font_list().GetFontStyle() & ~gfx::Font::BOLD)); | 305 label->font_list().GetFontStyle() & ~gfx::Font::BOLD)); |
306 } | 306 } |
307 | 307 |
308 } // namespace tray | 308 } // namespace tray |
309 } // namespace internal | 309 } // namespace internal |
310 } // namespace ash | 310 } // namespace ash |
OLD | NEW |