diff options
| author | yukishiino@chromium.org <yukishiino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-26 16:50:27 +0000 |
|---|---|---|
| committer | yukishiino@chromium.org <yukishiino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-26 16:50:27 +0000 |
| commit | eb480623bd4d7c98ce7527835a098c62413867a2 (patch) | |
| tree | cfdda9b173f29e7b91811d1afb6f10db8b922cb1 /ash/system/monitor/tray_monitor.cc | |
| parent | 13887217612069e2db97fec335f53137ccaad8d3 (diff) | |
| download | chromium_src-eb480623bd4d7c98ce7527835a098c62413867a2.zip chromium_src-eb480623bd4d7c98ce7527835a098c62413867a2.tar.gz chromium_src-eb480623bd4d7c98ce7527835a098c62413867a2.tar.bz2 | |
Clean-up: Replaces gfx::Font with gfx::FontList in ash/.
As part of effort to support multiple fonts, this CL changes methods which are now taking gfx::Font so they will take gfx::FontList instead.
See https://docs.google.com/a/chromium.org/document/d/1D_25fp9B8b9aZJORfAjDIFq61NWvUquZ5xmKH-VcC4k/view
BUG=265485
TEST=Run unit_tests, ui_unittests, views_unittests, ash_unittests.
Review URL: https://codereview.chromium.org/110953006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/monitor/tray_monitor.cc')
| -rw-r--r-- | ash/system/monitor/tray_monitor.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/system/monitor/tray_monitor.cc b/ash/system/monitor/tray_monitor.cc index fc87a3a..6719a5d0 100644 --- a/ash/system/monitor/tray_monitor.cc +++ b/ash/system/monitor/tray_monitor.cc @@ -44,7 +44,7 @@ views::View* TrayMonitor::CreateTrayView(user::LoginStatus status) { SkColorSetARGB(64, 0, 0, 0)); label_->SetShadowOffset(0, 1); label_->SetHorizontalAlignment(gfx::ALIGN_LEFT); - label_->SetFont(label_->font().DeriveFont(-2)); + label_->SetFontList(label_->font_list().DeriveFontListWithSizeDelta(-2)); return view; } |