Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1087)

Unified Diff: ash/ime/candidate_view.cc

Issue 140693017: Clean-up: Replaces obsolete Font/FontList methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Synced. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/system/chromeos/audio/tray_audio.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/ime/candidate_view.cc
diff --git a/ash/ime/candidate_view.cc b/ash/ime/candidate_view.cc
index eaa790a9a4e6429fb7cc4ef3a35b2c9085fdd86b..82c90092387e18f498932c5963dab77e98f83412 100644
--- a/ash/ime/candidate_view.cc
+++ b/ash/ime/candidate_view.cc
@@ -52,12 +52,10 @@ views::Label* CreateShortcutLabel(
if (orientation == ui::CandidateWindow::VERTICAL) {
shortcut_label->SetFontList(
- shortcut_label->font_list().DeriveFontListWithSizeDeltaAndStyle(
- kFontSizeDelta, gfx::Font::BOLD));
+ shortcut_label->font_list().Derive(kFontSizeDelta, gfx::Font::BOLD));
} else {
shortcut_label->SetFontList(
- shortcut_label->font_list().DeriveFontListWithSizeDelta(
- kFontSizeDelta));
+ shortcut_label->font_list().DeriveWithSizeDelta(kFontSizeDelta));
}
// TODO(satorux): Maybe we need to use language specific fonts for
// candidate_label, like Chinese font for Chinese input method?
@@ -108,7 +106,7 @@ views::Label* CreateCandidateLabel(
// Change the font size.
candidate_label->SetFontList(
- candidate_label->font_list().DeriveFontListWithSizeDelta(kFontSizeDelta));
+ candidate_label->font_list().DeriveWithSizeDelta(kFontSizeDelta));
candidate_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
return candidate_label;
@@ -124,8 +122,7 @@ views::Label* CreateAnnotationLabel(
// Change the font size and color.
annotation_label->SetFontList(
- annotation_label->font_list().DeriveFontListWithSizeDelta(
- kFontSizeDelta));
+ annotation_label->font_list().DeriveWithSizeDelta(kFontSizeDelta));
annotation_label->SetEnabledColor(theme.GetSystemColor(
ui::NativeTheme::kColorId_LabelDisabledColor));
annotation_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
« no previous file with comments | « no previous file | ash/system/chromeos/audio/tray_audio.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698