| Index: ash/system/date/tray_date.cc
|
| diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc
|
| index 766736f61840b1c2cc0947c43a7d2c540b171fe8..c6ead5e731c2a145ad85bfdf6b5926625042fb76 100644
|
| --- a/ash/system/date/tray_date.cc
|
| +++ b/ash/system/date/tray_date.cc
|
| @@ -130,16 +130,11 @@ TrayDate::~TrayDate() {
|
|
|
| views::View* TrayDate::CreateTrayView(user::LoginStatus status) {
|
| CHECK(time_tray_ == NULL);
|
| - time_tray_ = new tray::TimeView();
|
| ClockLayout clock_layout =
|
| ash::Shell::GetInstance()->system_tray()->shelf_alignment() ==
|
| SHELF_ALIGNMENT_BOTTOM ?
|
| HORIZONTAL_CLOCK : VERTICAL_CLOCK;
|
| - time_tray_->UpdateClockLayout(clock_layout);
|
| - SetupLabelForTimeTray(time_tray_->label());
|
| - SetupLabelForTimeTray(time_tray_->label_hour());
|
| - SetupLabelForTimeTray(time_tray_->label_minute());
|
| -
|
| + time_tray_ = new tray::TimeView(clock_layout);
|
| views::View* view = new TrayItemView;
|
| view->AddChildView(time_tray_);
|
| return view;
|
| @@ -184,11 +179,5 @@ void TrayDate::Refresh() {
|
| time_tray_->UpdateText();
|
| }
|
|
|
| -void TrayDate::SetupLabelForTimeTray(views::Label* label) {
|
| - SetupLabelForTray(label);
|
| - gfx::Font font = label->font();
|
| - label->SetFont(font.DeriveFont(0, font.GetStyle() & ~gfx::Font::BOLD));
|
| -}
|
| -
|
| } // namespace internal
|
| } // namespace ash
|
|
|