Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / ash / system / tray / hover_highlight_view.cc

diff --git a/src/ash/system/tray/hover_highlight_view.cc b/src/ash/system/tray/hover_highlight_view.cc
index a1b08db..e5956b9 100644 (file)
--- a/src/ash/system/tray/hover_highlight_view.cc
+++ b/src/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_);