Chromium Code Reviews| Index: ash/system/tray/tray_utils.cc |
| diff --git a/ash/system/tray/tray_utils.cc b/ash/system/tray/tray_utils.cc |
| index 215311753eae84a9ef6ef8bc9afe9a1e4f188fa6..924fe7c3b434dfb07a3f291bd5c5269083afeac2 100644 |
| --- a/ash/system/tray/tray_utils.cc |
| +++ b/ash/system/tray/tray_utils.cc |
| @@ -13,17 +13,15 @@ |
| namespace ash { |
| void SetupLabelForTray(views::Label* label) { |
| - // Making label_font static to avoid the time penalty of Derive for all but |
| - // the first call. |
| - static const gfx::FontList label_font_list( |
| + // |font_list| is static to avoid repeated inefficient Derive calls. |
| + static const gfx::FontList font_list( |
|
sky
2014/06/18 00:04:40
Style guide says no statics like this.
msw
2014/06/18 00:15:27
Hmm, for some reason I thought they were okay when
|
| gfx::FontList().Derive(1, gfx::Font::BOLD)); |
| - label->SetFontList(label_font_list); |
| + label->SetFontList(font_list); |
| label->SetAutoColorReadabilityEnabled(false); |
| label->SetEnabledColor(SK_ColorWHITE); |
| label->SetBackgroundColor(SkColorSetARGB(0, 255, 255, 255)); |
| - label->SetShadowColors(SkColorSetARGB(64, 0, 0, 0), |
| - SkColorSetARGB(64, 0, 0, 0)); |
| - label->SetShadowOffset(0, 1); |
| + label->set_shadows(gfx::ShadowValues(1, |
| + gfx::ShadowValue(gfx::Point(0, 1), 0, SkColorSetARGB(64, 0, 0, 0)))); |
| } |
| void SetTrayImageItemBorder(views::View* tray_view, |