X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fash%2Fsystem%2Ftray%2Fhover_highlight_view.cc;h=e5956b9fa18c512f8ac1d4e26acd4061e7eca15d;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=a1b08db257ce30e61786e0aac98de0131f37a89c;hpb=d1e23c6ec4202b125fc446349b2230d4cd978d86;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/ash/system/tray/hover_highlight_view.cc b/src/ash/system/tray/hover_highlight_view.cc index a1b08db..e5956b9 100644 --- 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_);