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

Unified Diff: ash/system/tray/hover_highlight_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 | « ash/system/session_length_limit/tray_session_length_limit.cc ('k') | ash/system/tray/tray_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/hover_highlight_view.cc
diff --git a/ash/system/tray/hover_highlight_view.cc b/ash/system/tray/hover_highlight_view.cc
index a1b08db257ce30e61786e0aac98de0131f37a89c..e5956b9fa18c512f8ac1d4e26acd4061e7eca15d 100644
--- a/ash/system/tray/hover_highlight_view.cc
+++ b/ash/system/tray/hover_highlight_view.cc
@@ -56,8 +56,7 @@ void HoverHighlightView::AddIconAndLabel(const gfx::ImageSkia& image,
text_label_ = new views::Label(text);
text_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
- text_label_->SetFontList(
- text_label_->font_list().DeriveFontListWithSizeDeltaAndStyle(0, style));
+ text_label_->SetFontList(text_label_->font_list().DeriveWithStyle(style));
if (text_default_color_)
text_label_->SetEnabledColor(text_default_color_);
AddChildView(text_label_);
@@ -80,8 +79,7 @@ views::Label* HoverHighlightView::AddLabel(const base::string16& text,
text_label_->SetBorder(
views::Border::CreateEmptyBorder(5, left_margin, 5, right_margin));
text_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
- text_label_->SetFontList(
- text_label_->font_list().DeriveFontListWithSizeDeltaAndStyle(0, style));
+ text_label_->SetFontList(text_label_->font_list().DeriveWithStyle(style));
// Do not set alpha value in disable color. It will have issue with elide
// blending filter in disabled state for rendering label text color.
text_label_->SetDisabledColor(SkColorSetARGB(255, 127, 127, 127));
@@ -113,8 +111,7 @@ views::Label* HoverHighlightView::AddCheckableLabel(const base::string16& text,
text_label_ = new views::Label(text);
text_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
- text_label_->SetFontList(
- text_label_->font_list().DeriveFontListWithSizeDeltaAndStyle(0, style));
+ text_label_->SetFontList(text_label_->font_list().DeriveWithStyle(style));
text_label_->SetDisabledColor(SkColorSetARGB(127, 0, 0, 0));
if (text_default_color_)
text_label_->SetEnabledColor(text_default_color_);
« no previous file with comments | « ash/system/session_length_limit/tray_session_length_limit.cc ('k') | ash/system/tray/tray_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698