diff options
| author | yukishiino@chromium.org <yukishiino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-02 20:33:23 +0000 |
|---|---|---|
| committer | yukishiino@chromium.org <yukishiino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-02 20:33:23 +0000 |
| commit | 77c2e235cb8ed0214de790422777bf7e520bd7a9 (patch) | |
| tree | 6dad4ed30f67701c717377a9f604b10bf2d33886 /chrome/browser/ui/views/accessibility | |
| parent | adeb5ed2b5ff8135d9cd94bd874b1c5e373b1d7a (diff) | |
| download | chromium_src-77c2e235cb8ed0214de790422777bf7e520bd7a9.zip chromium_src-77c2e235cb8ed0214de790422777bf7e520bd7a9.tar.gz chromium_src-77c2e235cb8ed0214de790422777bf7e520bd7a9.tar.bz2 | |
Clean-up: Replaces gfx::Font with gfx::FontList in c/b/ui/views.
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
TBR=estade@chromium.org, jianli@chromium.org, markusheintz@chromium.org
BUG=265485
TEST=Run unit_tests, ui_unittests, views_unittests
Review URL: https://codereview.chromium.org/121183002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242786 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/accessibility')
| -rw-r--r-- | chrome/browser/ui/views/accessibility/invert_bubble_view.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/chrome/browser/ui/views/accessibility/invert_bubble_view.cc b/chrome/browser/ui/views/accessibility/invert_bubble_view.cc index dc120bb..52c3db1 100644 --- a/chrome/browser/ui/views/accessibility/invert_bubble_view.cc +++ b/chrome/browser/ui/views/accessibility/invert_bubble_view.cc @@ -68,30 +68,32 @@ InvertBubbleView::~InvertBubbleView() { void InvertBubbleView::Init() { ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); - const gfx::Font& original_font = rb.GetFont(ui::ResourceBundle::MediumFont); + const gfx::FontList& original_font_list = + rb.GetFontList(ui::ResourceBundle::MediumFont); views::Label* title = new views::Label( - l10n_util::GetStringUTF16(IDS_HIGH_CONTRAST_NOTIFICATION)); - title->SetFont(original_font.DeriveFont(2, gfx::Font::BOLD)); + l10n_util::GetStringUTF16(IDS_HIGH_CONTRAST_NOTIFICATION), + original_font_list.DeriveFontListWithSizeDeltaAndStyle(2, + gfx::Font::BOLD)); title->SetMultiLine(true); title->SizeToFit(kBubbleWidth); learn_more_ = new views::Link(l10n_util::GetStringUTF16(IDS_LEARN_MORE)); - learn_more_->SetFont(original_font); + learn_more_->SetFontList(original_font_list); learn_more_->set_listener(this); high_contrast_ = new views::Link(l10n_util::GetStringUTF16(IDS_HIGH_CONTRAST_EXT)); - high_contrast_->SetFont(original_font); + high_contrast_->SetFontList(original_font_list); high_contrast_->set_listener(this); dark_theme_ = new views::Link(l10n_util::GetStringUTF16(IDS_DARK_THEME)); - dark_theme_->SetFont(original_font); + dark_theme_->SetFontList(original_font_list); dark_theme_->set_listener(this); close_ = new views::Link(l10n_util::GetStringUTF16(IDS_CLOSE)); - close_->SetFont(original_font); + close_->SetFontList(original_font_list); close_->set_listener(this); views::GridLayout* layout = views::GridLayout::CreatePanel(this); |