| Index: ash/system/tray/tray_views.cc
|
| diff --git a/ash/system/tray/tray_views.cc b/ash/system/tray/tray_views.cc
|
| index 8a4495576e602a76988a51a548cc9762005308be..86d9f0514284f77ab558be1ab25f705eb472b59d 100644
|
| --- a/ash/system/tray/tray_views.cc
|
| +++ b/ash/system/tray/tray_views.cc
|
| @@ -698,8 +698,10 @@ void SpecialPopupRow::Layout() {
|
| }
|
|
|
| void SetupLabelForTray(views::Label* label) {
|
| - ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
|
| - label->SetFont(rb.GetFont(ui::ResourceBundle::BoldFont));
|
| + // Making label_font static to avoid the time penalty of DeriveFont for
|
| + // all but the first call.
|
| + static const gfx::Font label_font(gfx::Font().DeriveFont(1, gfx::Font::BOLD));
|
| + label->SetFont(label_font);
|
| label->SetAutoColorReadabilityEnabled(false);
|
| label->SetEnabledColor(SK_ColorWHITE);
|
| label->SetBackgroundColor(SkColorSetARGB(0, 255, 255, 255));
|
|
|