summaryrefslogtreecommitdiffstats
path: root/ash/ime/infolist_window.h
diff options
context:
space:
mode:
authoryukishiino@chromium.org <yukishiino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-31 05:31:52 +0000
committeryukishiino@chromium.org <yukishiino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-31 05:31:52 +0000
commit04b25011a789dcd404c4b4558d65617c95118686 (patch)
treee616631831ebbc14d6534f999ff9c1f1906c20e7 /ash/ime/infolist_window.h
parent9d57129247f45a5d1c9de3c11221b6776e3f255b (diff)
downloadchromium_src-04b25011a789dcd404c4b4558d65617c95118686.zip
chromium_src-04b25011a789dcd404c4b4558d65617c95118686.tar.gz
chromium_src-04b25011a789dcd404c4b4558d65617c95118686.tar.bz2
Renames gfx::FontList::Derive* family.
1. Removes obsolete methods. - DeriveFontList(font_style) # The method name and argument are not clear compared to other versions. Use DeriveWithStyle(style) below instead. - DeriveFontListWithSize(absolute_size) # Don't specify the absolute size. 2. Renames very long named methods. - DeriveFontListWithSizeDeltaAndStyle => Derive - DeriveFontListWithSizeDelta => DeriveWithSizeDelta - new method => DeriveWithStyle Since DeriveFontListWithSizeDeltaAndStyle is used more often than DeriveFontListWithSizeDelta, so give the former a shorter name. Review URL: https://codereview.chromium.org/142523003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248131 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ime/infolist_window.h')
-rw-r--r--ash/ime/infolist_window.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/ime/infolist_window.h b/ash/ime/infolist_window.h
index e7c984a..921c87b 100644
--- a/ash/ime/infolist_window.h
+++ b/ash/ime/infolist_window.h
@@ -48,10 +48,10 @@ class ASH_EXPORT InfolistWindow : public views::BubbleDelegateView {
std::vector<InfolistEntryView*> entry_views_;
// Information title font.
- gfx::FontList title_font_;
+ gfx::FontList title_font_list_;
// Information description font.
- gfx::FontList description_font_;
+ gfx::FontList description_font_list_;
base::OneShotTimer<views::Widget> show_hide_timer_;